Improved distinction between Operator,