Do not ask for addresses right after connect
Convert to ETS in peerdiscovery