Updated to maintain current session data