Added optional command line arguments