diff --git a/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/MySqlDialect.java b/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/MySqlDialect.java
index f1b6661..ea4db8c 100644
--- a/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/MySqlDialect.java
+++ b/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/MySqlDialect.java
@@ -42,8 +42,8 @@ public String buildSubsidiaryInsertSql(String tableName, List<String> tableColum
 
     @Override
     public String mapColumnType(String type) {
-        if (type != null && type.contains("<max>")) {
-            return type.replace("VARCHAR(<max>)", "LONGTEXT").replace("<max>", "65535");
+        if ("LARGE_TEXT".equalsIgnoreCase(type)) {
+            return "LONGTEXT";
         }
         return type;
     }
diff --git a/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/OracleDialect.java b/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/OracleDialect.java
index c823270..c215413 100644
--- a/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/OracleDialect.java
+++ b/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/OracleDialect.java
@@ -32,8 +32,8 @@ public String buildSubsidiaryInsertSql(String tableName, java.util.List<String>
 
     @Override
     public String mapColumnType(String type) {
-        if (type != null && type.contains("<max>")) {
-            return type.replace("VARCHAR(<max>)", "CLOB").replace("<max>", "4000");
+        if ("LARGE_TEXT".equalsIgnoreCase(type)) {
+            return "CLOB";
         }
         return type;
     }
diff --git a/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/PostgreSqlDialect.java b/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/PostgreSqlDialect.java
index 2155350..1f764c5 100644
--- a/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/PostgreSqlDialect.java
+++ b/teaql-sql-portable/src/main/java/io/teaql/core/sql/dialect/PostgreSqlDialect.java
@@ -53,8 +53,8 @@ public String buildSubsidiaryInsertSql(String tableName, List<String> tableColum
 
     @Override
     public String mapColumnType(String type) {
-        if (type != null && type.contains("<max>")) {
-            return type.replace("VARCHAR(<max>)", "TEXT").replace("<max>", "255");
+        if ("LARGE_TEXT".equalsIgnoreCase(type)) {
+            return "TEXT";
         }
         return type;
     }
diff --git a/teaql-sql-portable/src/main/java/io/teaql/core/sql/portable/SQLPropertyUtil.java b/teaql-sql-portable/src/main/java/io/teaql/core/sql/portable/SQLPropertyUtil.java
index 374fbf5..e93d5c6 100644
--- a/teaql-sql-portable/src/main/java/io/teaql/core/sql/portable/SQLPropertyUtil.java
+++ b/teaql-sql-portable/src/main/java/io/teaql/core/sql/portable/SQLPropertyUtil.java
@@ -51,6 +51,10 @@ public static List<SQLColumn> getColumns(PropertyDescriptor property) {
             }
         }
         String columnType = property.getStr("sqlType", defaultType);
+        if (columnType != null && columnType.contains("<max>")) {
+            String maxStr = property.getStr("max", "255");
+            columnType = columnType.replace("<max>", maxStr);
+        }
         
         if (tableName != null && columnName != null) {
             SQLColumn sqlColumn = new SQLColumn(tableName, columnName);