Updated benchmarking modules