Simplified benchmarks - making them easier to extend