Added more to DTO