Benchmarks refactored
Benchmarks refactored