Added support code for YAML fields.