diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
similarity index 94%
rename from ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
rename to ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
index 2928c7955..21df015e3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java
+++ b/ebean-core-type/src/main/java/io/ebean/core/type/ScalarTypeBaseDate.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.server.type;
+package io.ebean.core.type;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -19,11 +19,11 @@ import java.sql.Types;
 /**
  * Base class for Date types.
  */
-abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
+public abstract class ScalarTypeBaseDate<T> extends ScalarTypeBase<T> {
 
   protected final JsonConfig.Date mode;
 
-  ScalarTypeBaseDate(JsonConfig.Date mode, Class<T> type, boolean jdbcNative, int jdbcType) {
+  public ScalarTypeBaseDate(JsonConfig.Date mode, Class<T> type, boolean jdbcNative, int jdbcType) {
     super(type, jdbcNative, jdbcType);
     this.mode = mode;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
index 84d7330da..eaf883cff 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDate.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.Date;
@@ -12,7 +13,7 @@ import java.sql.Types;
 /**
  * ScalarType for java.sql.Date.
  */
-final class ScalarTypeDate extends ScalarTypeBaseDate<java.sql.Date> {
+final class ScalarTypeDate extends ScalarTypeBaseDate<Date> {
 
   ScalarTypeDate(JsonConfig.Date mode) {
     super(mode, Date.class, true, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
index 9a7990a6d..03c4e5897 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaDateMidnight.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 import org.joda.time.DateMidnight;
 
@@ -11,7 +12,7 @@ import java.sql.Types;
  * ScalarType for Joda DateMidnight. This maps to a JDBC Date.
  */
 @SuppressWarnings("deprecation")
-final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<org.joda.time.DateMidnight> {
+final class ScalarTypeJodaDateMidnight extends ScalarTypeBaseDate<DateMidnight> {
 
   /**
    * Instantiates a new scalar type joda date midnight.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
index f5f85a4db..92a17a8f7 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 import java.sql.Date;
 import java.sql.Types;
 
+import io.ebean.core.type.ScalarTypeBaseDate;
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
index c3e26ce56..0461faddc 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java
@@ -8,6 +8,7 @@ import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 /**
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
index 725d76055..0f4c952c1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUtilDate.java
@@ -3,6 +3,7 @@ package io.ebeaninternal.server.type;
 import io.ebean.config.JsonConfig;
 import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.SQLException;
@@ -89,7 +90,7 @@ final class ScalarTypeUtilDate {
     }
   }
 
-  static final class DateType extends ScalarTypeBaseDate<java.util.Date> {
+  static final class DateType extends ScalarTypeBaseDate<Date> {
 
     DateType(JsonConfig.Date mode) {
       super(mode, Date.class, false, Types.DATE);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
index e7ee97287..c662c8ca0 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java
@@ -1,6 +1,7 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.config.JsonConfig;
+import io.ebean.core.type.ScalarTypeBaseDate;
 import io.ebeaninternal.server.core.BasicTypeConverter;
 
 import java.sql.Date;