Added more command line arguments for program modularity