Improve session