Refactoring model mapping