Adding session management