Added support for more OP