Fix bug in CommandParser. Substituted FlexiCommandParser with the new CommandParser