Added more OP code support