Mapping refactoring