Updates to benchmarking code