Add DTO and change  to