Use class enum for opcodes also