Refactored PerfMeasurement, integrated with client