Improved YAML format for terms