Improve benchmarks