Added support for more operations