Added command line arg support