Bring across the mapping refactoring