Improve session entity