Added YAML support for mapping