Updated to new session model