Added command line switches.