Adding support for server discovery for client.