ENH: Pv connection logic