Completed changes to create stubbed YAML in new format.