Added more command line arguments