More changes to schema