Refactoring out concrete mapper logic