Yaml id refactor