little changes in Entity class