Added a command parser