Some changes in Entities