Update for new Session API