Improved benchmark runner