Refactored sessions