added support for yaml mappings