Create new DTOs + Service to stop the bleeding entirely