Session helper changes