Refactored Session