diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep1.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep1.java
index defaf2f6a5..00eeda52ef 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep1.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep1.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep1<T1> {
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
-    ConstraintForeignKeyOnStep references(String table, String field1);
+    @Support
+    ConstraintFinalStep references(String table, String field1);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
-    ConstraintForeignKeyOnStep references(Table<?> table, Field<T1> field1);
+    @Support
+    ConstraintFinalStep references(Table<?> table, Field<T1> field1);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep10.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep10.java
index 037c2b1406..1e6ff046be 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep10.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep10.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep10<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep11.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep11.java
index 85eb2729c2..5391c94d88 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep11.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep11.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep11<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep12.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep12.java
index 8fe5b457e5..b832a1eab6 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep12.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep12.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep12<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep13.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep13.java
index 1335a44c38..a1ff110cb8 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep13.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep13.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep13<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep14.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep14.java
index 517eaaaacd..888bf56fdc 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep14.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep14.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep14<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep15.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep15.java
index 6fc3831161..6cfd52c866 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep15.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep15.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep15<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep16.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep16.java
index 894515f77b..24941546bb 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep16.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep16.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep16<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep17.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep17.java
index 42137fb8f6..58f45ced14 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep17.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep17.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep17<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16, String field17);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep18.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep18.java
index 8cded4ff8d..8e3f58a9ae 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep18.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep18.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep18<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16, String field17, String field18);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep19.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep19.java
index 61919da58f..2c1a0b5ab4 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep19.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep19.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep19<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16, String field17, String field18, String field19);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep2.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep2.java
index f8ddefb009..ad7f7735e7 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep2.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep2.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep2<T1, T2> {
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep20.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep20.java
index 44282f758c..cf08c4ce61 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep20.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep20.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep20<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16, String field17, String field18, String field19, String field20);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep21.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep21.java
index bb102fffa0..1b6aefa0fc 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep21.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep21.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep21<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16, String field17, String field18, String field19, String field20, String field21);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep22.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep22.java
index 9bc78da54e..713dd6d756 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep22.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep22.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep22<T1, T2, T3, T4, T5, T6, T7
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9, String field10, String field11, String field12, String field13, String field14, String field15, String field16, String field17, String field18, String field19, String field20, String field21, String field22);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9, Field<T10> field10, Field<T11> field11, Field<T12> field12, Field<T13> field13, Field<T14> field14, Field<T15> field15, Field<T16> field16, Field<T17> field17, Field<T18> field18, Field<T19> field19, Field<T20> field20, Field<T21> field21, Field<T22> field22);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep3.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep3.java
index 76d21a91cd..78522d4dc9 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep3.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep3.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep3<T1, T2, T3> {
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep4.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep4.java
index 423b5ea0ad..3d9d66c466 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep4.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep4.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep4<T1, T2, T3, T4> {
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep5.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep5.java
index 2426d420e3..f5e9721f07 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep5.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep5.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep5<T1, T2, T3, T4, T5> {
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep6.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep6.java
index e7178c4bd8..5e1e973436 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep6.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep6.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep6<T1, T2, T3, T4, T5, T6> {
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep7.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep7.java
index 24e1693395..f952a9e963 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep7.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep7.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep7<T1, T2, T3, T4, T5, T6, T7>
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep8.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep8.java
index 853c834b93..70708d67be 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep8.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep8.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep8<T1, T2, T3, T4, T5, T6, T7,
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8);
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep9.java b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep9.java
index 676e95bf74..936700f48a 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep9.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintForeignKeyReferencesStep9.java
@@ -42,6 +42,8 @@ package org.jooq;
 
 import javax.annotation.Generated;
 
+import org.jooq.Support;
+
 /**
  * The step in the {@link Constraint} construction DSL API that allows for
  * matching a <code>FOREIGN KEY</code> clause with a <code>REFERENCES</code>
@@ -55,10 +57,12 @@ public interface ConstraintForeignKeyReferencesStep9<T1, T2, T3, T4, T5, T6, T7,
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(String table, String field1, String field2, String field3, String field4, String field5, String field6, String field7, String field8, String field9);
 
     /**
      * Add a <code>REFERENCES</code> clause to the <code>CONSTRAINT</code>.
      */
+    @Support
     ConstraintFinalStep references(Table<?> table, Field<T1> field1, Field<T2> field2, Field<T3> field3, Field<T4> field4, Field<T5> field5, Field<T6> field6, Field<T7> field7, Field<T8> field8, Field<T9> field9);
 }