Adding PeerClient support.