Some changes in entities.