Some changes to schema