Adding PeerDBDiscovery classes
Adding PeerDBDiscovery (with bug fix)