Improved benchmark logic