Added client tracking to server