Added machine configuration to command line arguments