Modify to handle command line args more flexible