Adding performance data collection