diff --git a/composer.json b/composer.json
index d89cf1b..6ad45c6 100644
--- a/composer.json
+++ b/composer.json
@@ -16,15 +16,16 @@
         }
     ],
     "require": {
-        "dynamic/silverstripe-country-dropdown-field": "^2",
+        "php": "^8.1",
+        "dynamic/silverstripe-country-dropdown-field": "^3",
         "geocoder-php/google-maps-provider": "^4.7",
         "guzzlehttp/guzzle": "^7.4",
         "php-http/guzzle7-adapter": "^1.0",
         "php-http/message": "^1.13",
-        "silverstripe/recipe-core": "^5.0"
+        "silverstripe/recipe-core": "^6"
     },
     "require-dev": {
-        "silverstripe/recipe-testing": "^3"
+        "silverstripe/recipe-testing": "^4"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -49,11 +50,6 @@
             "url": "https://github.com/sponsors/dynamic"
         }
     ],
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
-    },
     "scripts": {
         "lint": "vendor/bin/phpcs src/ tests/",
         "lint-clean": "vendor/bin/phpcbf src/ tests/"
diff --git a/src/AddressDataExtension.php b/src/AddressDataExtension.php
index b439444..98d3533 100644
--- a/src/AddressDataExtension.php
+++ b/src/AddressDataExtension.php
@@ -13,7 +13,7 @@
 use SilverStripe\Forms\LiteralField;
 use SilverStripe\Forms\ReadonlyField;
 use SilverStripe\Forms\TextField;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\View\SSViewer;
 use SilverStripe\View\ThemeResourceLoader;
 
@@ -31,7 +31,7 @@
  * @property float $Lat
  * @property float $Lng
  */
-class AddressDataExtension extends DataExtension
+class AddressDataExtension extends Extension
 {
     /**
      * @var array
@@ -326,9 +326,8 @@ public function isAddressChanged($level = 1)
     /**
      *
      */
-    public function onBeforeWrite()
+    protected function onBeforeWrite()
     {
-        parent::onBeforeWrite();
         if ($this->hasAddress() && !$this->owner->config()->get('disable_geocoding')
             && Config::inst()->get(GoogleGeocoder::class, 'geocoder_api_key')) {
             if (!$this->isAddressChanged()) {
diff --git a/src/DistanceDataExtension.php b/src/DistanceDataExtension.php
index 5484ae0..e1388cf 100644
--- a/src/DistanceDataExtension.php
+++ b/src/DistanceDataExtension.php
@@ -3,23 +3,21 @@
 namespace Dynamic\SilverStripeGeocoder;
 
 use SilverStripe\Core\Config\Config;
-use SilverStripe\ORM\DataExtension;
+use SilverStripe\Core\Extension;
 use SilverStripe\ORM\Queries\SQLSelect;
 use SilverStripe\ORM\DataQuery;
 use SilverStripe\Control\Controller;
 
 /**
  * Class \Dynamic\SilverStripeGeocoder\DistanceDataExtension
- *
- * @property DistanceDataExtension $owner
  */
-class DistanceDataExtension extends DataExtension
+class DistanceDataExtension extends Extension
 {
     /**
      * @param SQLSelect $query
      * @param DataQuery|null $dataQuery
      */
-    public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
+    public function augmentSQL(SQLSelect $query, ?DataQuery $dataQuery = null)
     {
         $addressVar = Config::inst()->get(DistanceDataExtension::class, 'address_var');
         $unitVar = Config::inst()->get(DistanceDataExtension::class, 'unit_var');