Yaml Helper refactor