Move session helper into redesign