Update to the new schema