Modified Entity class