Changed hints to make use of getCommandType