Added support for default values for values in key-value maps. Also supports -Denable.option syntax for optional arguments