Tightened up session impl