Updated base class.