Yaml refactor