Migrate and use the new fields.