Mapping refactor fix