Session management improved