Add PeerFactory changes