Added support for more OP codes