Match schema to upgrade schema