Migrating to schemav3