Changed the Command and Add types to work with COMMAND_TYPE instead of strings
Changed Command type to work with COMMAND_TYPE