Refactored DTO mappings.