Mappers refactoring