More additions to opcode type