Command line parsing and handling updated