Add some sub-functions back to the benchmark