Added extra command line options