Improve benchmark mode