Improve session config