Added more command line args