Rework session management again