Improve the benchmarks