Adding session wrapper
Fix to session wrapper