Refactor OperationTrakingListener