+ Refactored session create to reduce complexity