some changes in the Entity