A lot of fixes method refactoring - Please fix the compile errorsin CommandParser!