More changes to align with new schema.