Added more commandline options