Updated YAML file formats