Improved YAML