Updated to the latest base class.