More YAML and NDA/IP stuff