Changed command line parsing