Refactored DTOs