Simplify instruction map
Add support for CB-prefixed commands