Updated CommandLineParser