Migrate MSC2 benchmarks to new API