More changes to the schema