Move DTO to service layer