Update for Session Handling