Fixed bug in new CLI build and parsing methods