More solid benchmarking infrastructure