Updated with latest base class