Some changes to Entities.*