[ENH] Better handling of connectivity in Proto