Restructured benchmarks