diff --git a/lib/src/main/java/io/cloudquery/helper/ArrowHelper.java b/lib/src/main/java/io/cloudquery/helper/ArrowHelper.java
index a22a6cd..c5f454b 100644
--- a/lib/src/main/java/io/cloudquery/helper/ArrowHelper.java
+++ b/lib/src/main/java/io/cloudquery/helper/ArrowHelper.java
@@ -149,9 +149,6 @@ public static Schema toArrowSchema(Table table) {
       Map<String, String> metadata = new HashMap<>();
       metadata.put("cq:extension:unique", column.isUnique() ? "true" : "false");
       metadata.put("cq:extension:primary_key", column.isPrimaryKey() ? "true" : "false");
-      if (column.getConstraintName() != null) {
-        metadata.put("cq:extension:constraint_name", column.getConstraintName());
-      }
       metadata.put("cq:extension:incremental", column.isIncrementalKey() ? "true" : "false");
       Field field =
           new Field(
@@ -171,6 +168,7 @@ public static Schema toArrowSchema(Table table) {
     if (table.getParent() != null) {
       metadata.put("cq:table_depends_on", table.getParent().getName());
     }
+    metadata.put("cq:extension:constraint_name", table.getConstraintName());
     return new Schema(asList(fields), metadata);
   }
 
diff --git a/lib/src/main/java/io/cloudquery/schema/Column.java b/lib/src/main/java/io/cloudquery/schema/Column.java
index c605417..bccfc26 100644
--- a/lib/src/main/java/io/cloudquery/schema/Column.java
+++ b/lib/src/main/java/io/cloudquery/schema/Column.java
@@ -10,7 +10,6 @@
 public class Column {
   private String name;
   private String description;
-  private String constraintName;
   private ArrowType type;
   private ColumnResolver resolver;
   private boolean primaryKey;
diff --git a/lib/src/main/java/io/cloudquery/schema/Table.java b/lib/src/main/java/io/cloudquery/schema/Table.java
index f900253..1cc62e5 100644
--- a/lib/src/main/java/io/cloudquery/schema/Table.java
+++ b/lib/src/main/java/io/cloudquery/schema/Table.java
@@ -121,6 +121,7 @@ public static int maxDepth(List<Table> tables) {
   }
 
   @NonNull private String name;
+  @Builder.Default private String constraintName = "";
   private TableResolver resolver;
   private String title;
   private String description;