Adding the refactored Benchmark code