Refactoring mapper