Added argument support as commandline key/value pairs.