Add support for tracking the operation state