- improve session handling