- Refactored DTO mapping logic out of the DTO objects.