Benchmark improvements