modified the model and DTO