Updated Session Handling