Improve Benchmark