Add flexibility for command line arguments

... to make it easier to run things in parallel