Improved CommandParser.