diff --git a/pom.xml b/pom.xml
index 96a8a0cee..53b1d6413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,93 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>io.ebean</groupId>
-    <artifactId>ebean-postgis</artifactId>
-    <version>0.1.4-SNAPSHOT</version>
+  <groupId>io.ebean</groupId>
+  <artifactId>ebean-postgis</artifactId>
+  <version>0.1.4-SNAPSHOT</version>
 
-    <parent>
-        <groupId>org.avaje</groupId>
-        <artifactId>java8-parent</artifactId>
-        <version>1.3</version>
-    </parent>
+  <parent>
+    <groupId>org.avaje</groupId>
+    <artifactId>java8-parent</artifactId>
+    <version>1.3</version>
+  </parent>
 
-    <properties>
-        <postgis.jdbc.version>2.2.1</postgis.jdbc.version>
-    </properties>
+  <properties>
+    <postgis.jdbc.version>2.2.1</postgis.jdbc.version>
+  </properties>
 
-    <scm>
-        <developerConnection>scm:git:git@github.com:ebean-orm/ebean-postgis.git</developerConnection>
-        <tag>HEAD</tag>
-    </scm>
+  <scm>
+    <developerConnection>scm:git:git@github.com:ebean-orm/ebean-postgis.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
 
-    <dependencies>
+  <dependencies>
 
-        <!-- Needs Ebean 8.6.1 or later -->
-        <dependency>
-            <groupId>io.ebean</groupId>
-            <artifactId>ebean</artifactId>
-            <version>10.1.1</version>
-            <scope>provided</scope>
-        </dependency>
+    <!-- Needs Ebean 8.6.1 or later -->
+    <dependency>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean</artifactId>
+      <version>11.19.1</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>net.postgis</groupId>
-            <artifactId>postgis-jdbc</artifactId>
-            <version>[${postgis.jdbc.version}]</version>
-        </dependency>
+    <dependency>
+      <groupId>net.postgis</groupId>
+      <artifactId>postgis-jdbc</artifactId>
+      <version>[${postgis.jdbc.version}]</version>
+    </dependency>
 
-        <!-- expected to be provided -->
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>9.4.1211.jre7</version>
-            <scope>provided</scope>
-        </dependency>
+    <!-- expected to be provided -->
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>42.2.2</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <!-- expected to be provided -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.20</version>
-            <scope>provided</scope>
-        </dependency>
+    <!-- expected to be provided -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.20</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <!-- optionally use geolatte-geom -->
-        <dependency>
-            <groupId>org.geolatte</groupId>
-            <artifactId>geolatte-geom</artifactId>
-            <version>1.0.6</version>
-            <scope>provided</scope>
-        </dependency>
+    <!-- optionally use geolatte-geom -->
+    <dependency>
+      <groupId>org.geolatte</groupId>
+      <artifactId>geolatte-geom</artifactId>
+      <version>1.0.6</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>org.avaje.composite</groupId>
-            <artifactId>composite-testing</artifactId>
-            <version>3.1</version>
-            <scope>test</scope>
-        </dependency>
+    <dependency>
+      <groupId>io.ebean.test</groupId>
+      <artifactId>ebean-test-config</artifactId>
+      <version>11.19.1</version>
+      <scope>test</scope>
+    </dependency>
 
-    </dependencies>
+    <dependency>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>logback</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
 
-    <build>
-        <plugins>
+    <dependency>
+      <groupId>org.avaje.composite</groupId>
+      <artifactId>composite-testing</artifactId>
+      <version>3.1</version>
+      <scope>test</scope>
+    </dependency>
 
-            <!-- for testing -->
-            <plugin>
-                <groupId>io.repaint.maven</groupId>
-                <artifactId>tiles-maven-plugin</artifactId>
-                <version>2.8</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <tiles>
-                        <tile>io.ebean.tile:enhancement:2.1</tile>
-                    </tiles>
-                </configuration>
-            </plugin>
+  </dependencies>
 
-        </plugins>
+  <build>
+    <plugins>
 
-    </build>
+      <!-- for testing -->
+      <plugin>
+        <groupId>io.repaint.maven</groupId>
+        <artifactId>tiles-maven-plugin</artifactId>
+        <version>2.11</version>
+        <extensions>true</extensions>
+        <configuration>
+          <tiles>
+            <tile>io.ebean.tile:enhancement:5.6</tile>
+          </tiles>
+        </configuration>
+      </plugin>
+
+    </plugins>
+
+  </build>
 
 </project>
diff --git a/src/main/java/io/ebean/postgis/RegisterFactory.java b/src/main/java/io/ebean/postgis/RegisterFactory.java
index 775b8fb38..2b1896b43 100644
--- a/src/main/java/io/ebean/postgis/RegisterFactory.java
+++ b/src/main/java/io/ebean/postgis/RegisterFactory.java
@@ -1,7 +1,7 @@
 package io.ebean.postgis;
 
 import io.ebean.config.ServerConfig;
-import io.ebean.plugin.ExtraTypeFactory;
+import io.ebeaninternal.api.ExtraTypeFactory;
 import io.ebean.postgis.latte.ScalarTypeGeoLatteLineString;
 import io.ebean.postgis.latte.ScalarTypeGeoLatteMultiLineString;
 import io.ebean.postgis.latte.ScalarTypeGeoLatteMultiPoint;
diff --git a/src/main/resources/META-INF/services/io.ebean.plugin.ExtraTypeFactory b/src/main/resources/META-INF/services/io.ebeaninternal.api.ExtraTypeFactory
similarity index 100%
rename from src/main/resources/META-INF/services/io.ebean.plugin.ExtraTypeFactory
rename to src/main/resources/META-INF/services/io.ebeaninternal.api.ExtraTypeFactory