Adding in more functionality for the CommandParser.