diff --git a/.travis.yml b/.travis.yml
index 29a5d37..0ff92f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,18 +7,32 @@ sudo: false
 php:
   - 5.5
   - 5.6
+  - 7.0
+  - 7.1
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.2
+  - DB=MYSQL CORE_RELEASE=4
 
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.2
+      env: DB=MYSQL CORE_RELEASE=4
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.3 SUBSITES=1
+      env: DB=MYSQL CORE_RELEASE=4 SUBSITES=1
     - php: 5.6
-      env: DB=MYSQL CORE_RELEASE=3.3 QUEUEDJOBS=1
+      env: DB=MYSQL CORE_RELEASE=4 QUEUEDJOBS=1
+    - php: 7.0
+      env: DB=MYSQL CORE_RELEASE=4
+    - php: 7.0
+      env: DB=MYSQL CORE_RELEASE=4 SUBSITES=1
+    - php: 7.0
+      env: DB=MYSQL CORE_RELEASE=4 QUEUEDJOBS=1
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=4
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=4 SUBSITES=1
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=4 QUEUEDJOBS=1
 
 before_script:
   - composer self-update || true
diff --git a/_config/binding.yml b/_config/binding.yml
index 5f1cfd2..d179d1e 100644
--- a/_config/binding.yml
+++ b/_config/binding.yml
@@ -1,5 +1,5 @@
-Injector:
-  RequestProcessor:
+SilverStripe\Core\Injector\Injector:
+  SilverStripe\Control\RequestProcessor:
     properties:
       filters:
-        - '%$SearchUpdater_BindManipulationCaptureFilter'
+        - '%$SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater_BindManipulationCaptureFilter'
diff --git a/_config/config.yml b/_config/config.yml
index 0c6c2ab..b54e0b3 100644
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -1,6 +1,3 @@
-DataObject:
+SilverStripe\ORM\DataObject:
   extensions:
-    - 'SearchUpdater_ObjectHandler'
-Database:
-  extensions:
-    - 'SearchManipulateCaptureExtension'
+    - SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater_ObjectHandler
diff --git a/_config/processor.yml b/_config/processor.yml
index 430ec5e..ae99f46 100644
--- a/_config/processor.yml
+++ b/_config/processor.yml
@@ -1,34 +1,22 @@
 ---
 Name: defaultprocessor
 ---
-Injector:
-  SearchUpdateProcessor:
-    class: SearchUpdateImmediateProcessor
-  SolrReindexHandler:
-    class: SolrReindexImmediateHandler
-  SearchLogFactory:
+SilverStripe\Core\Injector\Injector:
+  SilverStripe\FullTextSearch\Search\Processors\SearchUpdateProcessor:
+    class: SilverStripe\FullTextSearch\Search\Processors\SearchUpdateImmediateProcessor
+  SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexHandler:
+    class: SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexImmediateHandler
+  SilverStripe\FullTextSearch\Utils\Logging\SearchLogFactory:
     class: 'MonologFactory'
 ---
-Name: messagequeueprocessor
-Only:
-  ModuleExists: messagequeue
-Except:
-  Environment: 'dev'
----
-Injector:
-  SearchUpdateProcessor:
-    class: SearchUpdateMessageQueueProcessor
-  SolrReindexHandler:
-    class: SolrReindexMessageHandler
----
 Name: queuedjobprocessor
 Only:
-  ModuleExists: queuedjobs
+  ModuleExists: silverstripe/queuedjobs
 Except:
   Environment: 'dev'
 ---
-Injector:
-  SearchUpdateProcessor:
-    class: SearchUpdateQueuedJobProcessor
-  SolrReindexHandler:
-    class: SolrReindexQueuedHandler
+SilverStripe\Core\Injector\Injector:
+  SilverStripe\FullTextSearch\Search\Processors\SearchUpdateProcessor:
+    class: SilverStripe\FullTextSearch\Search\Processors\SearchUpdateQueuedJobProcessor
+  SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexHandler:
+    class: SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexQueuedHandler