Fixed setup to use commandline arguments