Changed all client methods to new benchmarking system