Rework connection <-> session communication