Added preliminary session management