Added support for operations