Interface change to P2P