Update to new schema