Benchmarks now use the new system