Updated Command Line Parser