Changes to Entity