Use Yaml where we can