Modifications in the Entity class