Move to JSON/YAML hybrid