Refactoring and data mapper