Change command line parsing