Added optional command line arg support