Added some command line options when running