diff --git a/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java b/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
index 8c359b2f8..1bae9fc33 100644
--- a/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
+++ b/hibernate-types-5/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
@@ -30,7 +30,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
         JdbcServices jdbcServices = serviceRegistry.getService(JdbcServices.class);
         Dialect dialect = jdbcServices.getDialect();
 
-        if(dialect instanceof PostgreSQLDialect) {
+        if(dialect instanceof PostgreSQL82Dialect) {
             /* Arrays */
             this
             .contributeType(typeContributions, BooleanArrayType.INSTANCE)
@@ -62,11 +62,11 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
             this
             .contributeType(typeContributions, JsonStringType.INSTANCE)
             .contributeType(typeContributions, JsonNodeStringType.INSTANCE);
-        } else if(dialect instanceof SQLServerDialect) {
+        } else if(dialect instanceof SQLServer2005Dialect) {
             /* JSON */
             this
             .contributeType(typeContributions, JsonStringType.INSTANCE);
-        } else if(dialect instanceof OracleDialect) {
+        } else if(dialect instanceof Oracle8iDialect) {
             /* Date/Time */
             this
             /* JSON */
diff --git a/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java b/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
index d7172aaee..efac626d1 100644
--- a/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
+++ b/hibernate-types-52/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
@@ -31,7 +31,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
         JdbcServices jdbcServices = serviceRegistry.getService(JdbcServices.class);
         Dialect dialect = jdbcServices.getDialect();
 
-        if(dialect instanceof PostgreSQLDialect) {
+        if(dialect instanceof PostgreSQL82Dialect) {
             /* Arrays */
             this
             .contributeType(typeContributions, BooleanArrayType.INSTANCE)
@@ -69,11 +69,11 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
             this
             .contributeType(typeContributions, JsonStringType.INSTANCE)
             .contributeType(typeContributions, JsonNodeStringType.INSTANCE);
-        } else if(dialect instanceof SQLServerDialect) {
+        } else if(dialect instanceof SQLServer2005Dialect) {
             /* JSON */
             this
             .contributeType(typeContributions, JsonStringType.INSTANCE);
-        } else if(dialect instanceof OracleDialect) {
+        } else if(dialect instanceof Oracle8iDialect) {
             /* Date/Time */
             this
             .contributeType(typeContributions, OracleIntervalDayToSecondType.INSTANCE)
diff --git a/hibernate-types-55/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java b/hibernate-types-55/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
index da93bffba..153176a43 100644
--- a/hibernate-types-55/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
+++ b/hibernate-types-55/src/main/java/com/vladmihalcea/hibernate/type/HibernateTypesContributor.java
@@ -31,7 +31,7 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
         JdbcServices jdbcServices = serviceRegistry.getService(JdbcServices.class);
         Dialect dialect = jdbcServices.getDialect();
 
-        if(dialect instanceof PostgreSQLDialect) {
+        if(dialect instanceof PostgreSQL82Dialect) {
             /* Arrays */
             this
             .contributeType(typeContributions, BooleanArrayType.INSTANCE)
@@ -69,11 +69,11 @@ public void contribute(TypeContributions typeContributions, ServiceRegistry serv
             this
             .contributeType(typeContributions, JsonStringType.INSTANCE)
             .contributeType(typeContributions, JsonNodeStringType.INSTANCE);
-        } else if(dialect instanceof SQLServerDialect) {
+        } else if(dialect instanceof SQLServer2005Dialect) {
             /* JSON */
             this
             .contributeType(typeContributions, JsonStringType.INSTANCE);
-        } else if(dialect instanceof OracleDialect) {
+        } else if(dialect instanceof Oracle8iDialect) {
             /* Date/Time */
             this
             .contributeType(typeContributions, OracleIntervalDayToSecondType.INSTANCE)