added in support for using YAML in all fields