More changes to Entity Model