Added client/server discovery