Switch to YORM for YAML mapping