Added command line parsing