YAML improvements