Improve session creation