Changes to accomodate new session model.