Simplifying PeerManager