Some more to Entity class