added support for other ops