Updated base class for 3.0.