diff --git a/src/RegistryImportFeed.php b/src/RegistryImportFeed.php
index 0fb0709..e282bf9 100644
--- a/src/RegistryImportFeed.php
+++ b/src/RegistryImportFeed.php
@@ -6,7 +6,7 @@
 use SilverStripe\Control\RSS\RSSFeed;
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injectable;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\FieldType\DBDatetime;
 
 class RegistryImportFeed
diff --git a/src/RegistryImportFeedEntry.php b/src/RegistryImportFeedEntry.php
index 75cf19b..15c3cc4 100644
--- a/src/RegistryImportFeedEntry.php
+++ b/src/RegistryImportFeedEntry.php
@@ -2,9 +2,9 @@
 
 namespace SilverStripe\Registry;
 
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ModelData;
 
-class RegistryImportFeedEntry extends ViewableData
+class RegistryImportFeedEntry extends ModelData
 {
     protected $title;
     protected $description;
diff --git a/src/RegistryPage.php b/src/RegistryPage.php
index c99e266..b0f8599 100644
--- a/src/RegistryPage.php
+++ b/src/RegistryPage.php
@@ -8,12 +8,12 @@
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\NumericField;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\View\SSViewer;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 
 class RegistryPage extends Page
 {
diff --git a/src/RegistryPageController.php b/src/RegistryPageController.php
index 8f89cfc..d086eb3 100644
--- a/src/RegistryPageController.php
+++ b/src/RegistryPageController.php
@@ -10,13 +10,13 @@
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormAction;
 use SilverStripe\Forms\HiddenField;
-use SilverStripe\ORM\ArrayList;
+use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\ORM\PaginatedList;
-use SilverStripe\ORM\SS_List;
+use SilverStripe\Model\List\PaginatedList;
+use SilverStripe\Model\List\SS_List;
 use SilverStripe\Registry\Exception\RegistryException;
-use SilverStripe\View\ArrayData;
-use SilverStripe\View\ViewableData;
+use SilverStripe\Model\ArrayData;
+use SilverStripe\Model\ModelData;
 
 /**
  * @extends PageController<RegistryPage>
@@ -235,7 +235,7 @@ public function Columns($id = null)
             // Increment properties for value
             $context = $result;
             foreach ($properties as $property) {
-                if ($context instanceof ViewableData) {
+                if ($context instanceof ModelData) {
                     $context = $context->obj($property);
                 }
             }