Updating command line parsing