Added some command line options