Migrate to sf2 3