Hotfix/session management