updated Entity classes