ReDesign
Mapping refactoring