extended to session management