Updated to latest base class.