work with new schema, refactor schema updates