Refactoring of the Mappers.