Updated tool to accept different command line parameter sets.