diff --git a/src/VersionFeed.php b/src/VersionFeed.php
index 35be278..1f62b2d 100644
--- a/src/VersionFeed.php
+++ b/src/VersionFeed.php
@@ -2,7 +2,6 @@
 
 namespace SilverStripe\VersionFeed;
 
-use SilverStripe\CMS\Model\SiteTreeExtension;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Forms\CheckboxField;
 use SilverStripe\Forms\FieldGroup;
@@ -13,12 +12,13 @@
 use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\View\Parsers\HtmlDiff;
 use SilverStripe\CMS\Model\SiteTree;
+use SilverStripe\Core\Extension;
 use SilverStripe\Versioned\Versioned_Version;
 
 /**
  * @extends Extension<SiteTree&static>
  */
-class VersionFeed extends SiteTreeExtension
+class VersionFeed extends Extension
 {
     private static $db = array(
         'PublicHistory' => 'Boolean(true)'
diff --git a/src/VersionFeedSiteConfig.php b/src/VersionFeedSiteConfig.php
index 077d647..0c05f24 100644
--- a/src/VersionFeedSiteConfig.php
+++ b/src/VersionFeedSiteConfig.php
@@ -6,15 +6,15 @@
 use SilverStripe\Forms\CheckboxField;
 use SilverStripe\Forms\FieldGroup;
 use SilverStripe\Forms\FieldList;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\SiteConfig\SiteConfig;
 
 /**
  * Allows global configuration of all changes
  *
- * @extends DataExtension<SiteConfig>
+ * @extends Extension<SiteConfig>
  */
-class VersionFeedSiteConfig extends DataExtension
+class VersionFeedSiteConfig extends Extension
 {
     private static $db = array(
         'AllChangesEnabled' => 'Boolean(true)'