Fixed legacy support for operations