Added support for some more operations