Replaced opcode defines with enum