Updated command parser to use new stuff