Added client link functionality