Changes to schema to match new plan