Added client tracking.