Clean up imports and use faster base class.
Clean up imports and use faster base class.

SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus