Added session management