Updates to benchmarking