Some changes in Entity