Updated Entities and DTOs