Improved benchmarker