Fixed the dtos