Added support for Operations