Added support for standard YAML key/value pairs