Edit and updated the Entity classes

Edit and updated the Entity classes