Refactored benchmarks