More support for paramaterized p2p connectivity