Added YamlFactory