Updated the base class with the version that preserves session.