create yaml mapping refactoring