Improve session switching