added support for Operation classes