YAML improvement