Added command line switches