Replace YAML mapping logic with YORM