Improved session data management