Refactoring mapping