Improve the parsing of the CLI