Changed the Command class to work with COMMAND_TYPE instead of String