updated DTOs and entities