Rebuilt for class-based Operation
Preparing to support inverse operations