Modified to support connection_find_friends