Improve benchmark