Switched from string keys to Instruction pointers
Fixed some conflicts (Thanks Sam :p )