Work in progress for session management