Refactored DTO mapper.
Refactored DTO mapper.