Improve benchmarking