Added functionality to session management