Finished switching to the new schema.