adding additional setup-command commandline-argument support