Refactored OperationViewers