Added some classes to change the way commands are handled