Benchmark setup enhancements