Added commandline options