diff --git a/jOOQ/src/main/java/org/jooq/Record1.java b/jOOQ/src/main/java/org/jooq/Record1.java
index 028e5c162b..9e16cfd508 100644
--- a/jOOQ/src/main/java/org/jooq/Record1.java
+++ b/jOOQ/src/main/java/org/jooq/Record1.java
@@ -89,19 +89,17 @@ public interface Record1<T1> extends Record {
      */
     Record1<T1> values(T1 t1);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record1<T1> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record1<T1> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record1<T1> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record1<T1> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record10.java b/jOOQ/src/main/java/org/jooq/Record10.java
index 77c6e824b2..2d7c2612f6 100644
--- a/jOOQ/src/main/java/org/jooq/Record10.java
+++ b/jOOQ/src/main/java/org/jooq/Record10.java
@@ -224,19 +224,17 @@ public interface Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends Recor
      */
     Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record11.java b/jOOQ/src/main/java/org/jooq/Record11.java
index f33fcd30d5..d458f0d42c 100644
--- a/jOOQ/src/main/java/org/jooq/Record11.java
+++ b/jOOQ/src/main/java/org/jooq/Record11.java
@@ -239,19 +239,17 @@ public interface Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends
      */
     Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record12.java b/jOOQ/src/main/java/org/jooq/Record12.java
index c6c22a673b..086f40702c 100644
--- a/jOOQ/src/main/java/org/jooq/Record12.java
+++ b/jOOQ/src/main/java/org/jooq/Record12.java
@@ -254,19 +254,17 @@ public interface Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> ext
      */
     Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record13.java b/jOOQ/src/main/java/org/jooq/Record13.java
index b501ccc48b..c7bfe2f69e 100644
--- a/jOOQ/src/main/java/org/jooq/Record13.java
+++ b/jOOQ/src/main/java/org/jooq/Record13.java
@@ -269,19 +269,17 @@ public interface Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record14.java b/jOOQ/src/main/java/org/jooq/Record14.java
index c7636c9ead..6d7e48f0fd 100644
--- a/jOOQ/src/main/java/org/jooq/Record14.java
+++ b/jOOQ/src/main/java/org/jooq/Record14.java
@@ -284,19 +284,17 @@ public interface Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record15.java b/jOOQ/src/main/java/org/jooq/Record15.java
index d71cdbf7c1..612249a347 100644
--- a/jOOQ/src/main/java/org/jooq/Record15.java
+++ b/jOOQ/src/main/java/org/jooq/Record15.java
@@ -299,19 +299,17 @@ public interface Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record16.java b/jOOQ/src/main/java/org/jooq/Record16.java
index 8906896c16..014b0a531e 100644
--- a/jOOQ/src/main/java/org/jooq/Record16.java
+++ b/jOOQ/src/main/java/org/jooq/Record16.java
@@ -314,19 +314,17 @@ public interface Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record17.java b/jOOQ/src/main/java/org/jooq/Record17.java
index 118dd85531..3fa3d23ce3 100644
--- a/jOOQ/src/main/java/org/jooq/Record17.java
+++ b/jOOQ/src/main/java/org/jooq/Record17.java
@@ -329,19 +329,17 @@ public interface Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record18.java b/jOOQ/src/main/java/org/jooq/Record18.java
index e99fe857d7..5f5038650d 100644
--- a/jOOQ/src/main/java/org/jooq/Record18.java
+++ b/jOOQ/src/main/java/org/jooq/Record18.java
@@ -344,19 +344,17 @@ public interface Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record19.java b/jOOQ/src/main/java/org/jooq/Record19.java
index 917bdb4661..1364543d7b 100644
--- a/jOOQ/src/main/java/org/jooq/Record19.java
+++ b/jOOQ/src/main/java/org/jooq/Record19.java
@@ -359,19 +359,17 @@ public interface Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record2.java b/jOOQ/src/main/java/org/jooq/Record2.java
index 9082744e52..9e6b079f8d 100644
--- a/jOOQ/src/main/java/org/jooq/Record2.java
+++ b/jOOQ/src/main/java/org/jooq/Record2.java
@@ -104,19 +104,17 @@ public interface Record2<T1, T2> extends Record {
      */
     Record2<T1, T2> values(T1 t1, T2 t2);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record2<T1, T2> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record2<T1, T2> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record2<T1, T2> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record2<T1, T2> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record20.java b/jOOQ/src/main/java/org/jooq/Record20.java
index b4425611bd..834f1a25e9 100644
--- a/jOOQ/src/main/java/org/jooq/Record20.java
+++ b/jOOQ/src/main/java/org/jooq/Record20.java
@@ -374,19 +374,17 @@ public interface Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record21.java b/jOOQ/src/main/java/org/jooq/Record21.java
index 40a9d324cf..792cd5c3ae 100644
--- a/jOOQ/src/main/java/org/jooq/Record21.java
+++ b/jOOQ/src/main/java/org/jooq/Record21.java
@@ -389,19 +389,17 @@ public interface Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record22.java b/jOOQ/src/main/java/org/jooq/Record22.java
index 97c2a8a75f..cab78680e7 100644
--- a/jOOQ/src/main/java/org/jooq/Record22.java
+++ b/jOOQ/src/main/java/org/jooq/Record22.java
@@ -404,19 +404,17 @@ public interface Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13
      */
     Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16, T17 t17, T18 t18, T19 t19, T20 t20, T21 t21, T22 t22);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record3.java b/jOOQ/src/main/java/org/jooq/Record3.java
index 5014904d44..dbee9f3b75 100644
--- a/jOOQ/src/main/java/org/jooq/Record3.java
+++ b/jOOQ/src/main/java/org/jooq/Record3.java
@@ -119,19 +119,17 @@ public interface Record3<T1, T2, T3> extends Record {
      */
     Record3<T1, T2, T3> values(T1 t1, T2 t2, T3 t3);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record3<T1, T2, T3> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record3<T1, T2, T3> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record3<T1, T2, T3> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record3<T1, T2, T3> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record4.java b/jOOQ/src/main/java/org/jooq/Record4.java
index fba3f5263b..c212b06b89 100644
--- a/jOOQ/src/main/java/org/jooq/Record4.java
+++ b/jOOQ/src/main/java/org/jooq/Record4.java
@@ -134,19 +134,17 @@ public interface Record4<T1, T2, T3, T4> extends Record {
      */
     Record4<T1, T2, T3, T4> values(T1 t1, T2 t2, T3 t3, T4 t4);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record4<T1, T2, T3, T4> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record4<T1, T2, T3, T4> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record4<T1, T2, T3, T4> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record4<T1, T2, T3, T4> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record5.java b/jOOQ/src/main/java/org/jooq/Record5.java
index ff12f8c911..0accca5d94 100644
--- a/jOOQ/src/main/java/org/jooq/Record5.java
+++ b/jOOQ/src/main/java/org/jooq/Record5.java
@@ -149,19 +149,17 @@ public interface Record5<T1, T2, T3, T4, T5> extends Record {
      */
     Record5<T1, T2, T3, T4, T5> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record5<T1, T2, T3, T4, T5> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record5<T1, T2, T3, T4, T5> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record5<T1, T2, T3, T4, T5> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record5<T1, T2, T3, T4, T5> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record6.java b/jOOQ/src/main/java/org/jooq/Record6.java
index 9c235ea3fe..cfedc46b73 100644
--- a/jOOQ/src/main/java/org/jooq/Record6.java
+++ b/jOOQ/src/main/java/org/jooq/Record6.java
@@ -164,19 +164,17 @@ public interface Record6<T1, T2, T3, T4, T5, T6> extends Record {
      */
     Record6<T1, T2, T3, T4, T5, T6> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record6<T1, T2, T3, T4, T5, T6> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record6<T1, T2, T3, T4, T5, T6> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record6<T1, T2, T3, T4, T5, T6> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record6<T1, T2, T3, T4, T5, T6> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record7.java b/jOOQ/src/main/java/org/jooq/Record7.java
index 9404739588..370f48ceab 100644
--- a/jOOQ/src/main/java/org/jooq/Record7.java
+++ b/jOOQ/src/main/java/org/jooq/Record7.java
@@ -179,19 +179,17 @@ public interface Record7<T1, T2, T3, T4, T5, T6, T7> extends Record {
      */
     Record7<T1, T2, T3, T4, T5, T6, T7> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record7<T1, T2, T3, T4, T5, T6, T7> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record7<T1, T2, T3, T4, T5, T6, T7> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record7<T1, T2, T3, T4, T5, T6, T7> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record7<T1, T2, T3, T4, T5, T6, T7> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record8.java b/jOOQ/src/main/java/org/jooq/Record8.java
index 9516a6552b..08b4b33446 100644
--- a/jOOQ/src/main/java/org/jooq/Record8.java
+++ b/jOOQ/src/main/java/org/jooq/Record8.java
@@ -194,19 +194,17 @@ public interface Record8<T1, T2, T3, T4, T5, T6, T7, T8> extends Record {
      */
     Record8<T1, T2, T3, T4, T5, T6, T7, T8> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record8<T1, T2, T3, T4, T5, T6, T7, T8> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record8<T1, T2, T3, T4, T5, T6, T7, T8> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record8<T1, T2, T3, T4, T5, T6, T7, T8> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record8<T1, T2, T3, T4, T5, T6, T7, T8> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/Record9.java b/jOOQ/src/main/java/org/jooq/Record9.java
index 722c5ea35d..45e68579c3 100644
--- a/jOOQ/src/main/java/org/jooq/Record9.java
+++ b/jOOQ/src/main/java/org/jooq/Record9.java
@@ -209,19 +209,17 @@ public interface Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends Record {
      */
     Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> values(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9);
 
-//  [#4695] [#5501] The following covariant overrides cannot be published yet for implementation reasons (see #4695)
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T> Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> with(Field<T> field, T value);
-//
-//  /**
-//   * {@inheritDoc}
-//   */
-//  @Override
-//  <T, U> Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T> Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> with(Field<T> field, T value);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    <T, U> Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> with(Field<T> field, U value, Converter<? extends T, ? super U> converter);
 
     // ------------------------------------------------------------------------
     // Value accessors for record destructuring in Kotlin
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl1.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl1.java
index 0dc548538b..caab7e325a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl1.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl1.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record1;
@@ -52,6 +51,7 @@ import org.jooq.Record1;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl1<T1> extends AbstractRecord implements InternalRecord, Record1<T1> {
 
     /**
@@ -99,6 +99,16 @@ class RecordImpl1<T1> extends AbstractRecord implements InternalRecord, Record1<
         return this;
     }
 
+    @Override
+    public <T> Record1<T1> with(Field<T> field, T value) {
+        return (Record1<T1>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record1<T1> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record1<T1>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl10.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl10.java
index a7073c5c2b..b1b8606520 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl10.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl10.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record10;
@@ -52,6 +51,7 @@ import org.jooq.Record10;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends AbstractRecord implements InternalRecord, Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
 
     /**
@@ -243,6 +243,16 @@ class RecordImpl10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends AbstractReco
         return this;
     }
 
+    @Override
+    public <T> Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> with(Field<T> field, T value) {
+        return (Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl11.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl11.java
index 063264773d..b80ca751b2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl11.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl11.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record11;
@@ -52,6 +51,7 @@ import org.jooq.Record11;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends AbstractRecord implements InternalRecord, Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
 
     /**
@@ -259,6 +259,16 @@ class RecordImpl11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends Abstrac
         return this;
     }
 
+    @Override
+    public <T> Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> with(Field<T> field, T value) {
+        return (Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl12.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl12.java
index b923be5942..4a8a0cf8a4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl12.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl12.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record12;
@@ -52,6 +51,7 @@ import org.jooq.Record12;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends AbstractRecord implements InternalRecord, Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
 
     /**
@@ -275,6 +275,16 @@ class RecordImpl12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends Ab
         return this;
     }
 
+    @Override
+    public <T> Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> with(Field<T> field, T value) {
+        return (Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl13.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl13.java
index 5a27be0b39..1d826042af 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl13.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl13.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record13;
@@ -52,6 +51,7 @@ import org.jooq.Record13;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends AbstractRecord implements InternalRecord, Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
 
     /**
@@ -291,6 +291,16 @@ class RecordImpl13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> exten
         return this;
     }
 
+    @Override
+    public <T> Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> with(Field<T> field, T value) {
+        return (Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl14.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl14.java
index 1799bef90c..8910c735e1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl14.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl14.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record14;
@@ -52,6 +51,7 @@ import org.jooq.Record14;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends AbstractRecord implements InternalRecord, Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
 
     /**
@@ -307,6 +307,16 @@ class RecordImpl14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>
         return this;
     }
 
+    @Override
+    public <T> Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> with(Field<T> field, T value) {
+        return (Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl15.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl15.java
index d2d34cec74..32553f3080 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl15.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl15.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record15;
@@ -52,6 +51,7 @@ import org.jooq.Record15;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends AbstractRecord implements InternalRecord, Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
 
     /**
@@ -323,6 +323,16 @@ class RecordImpl15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
         return this;
     }
 
+    @Override
+    public <T> Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> with(Field<T> field, T value) {
+        return (Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl16.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl16.java
index 077f42eec2..e654a8f272 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl16.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl16.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record16;
@@ -52,6 +51,7 @@ import org.jooq.Record16;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends AbstractRecord implements InternalRecord, Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
 
     /**
@@ -339,6 +339,16 @@ class RecordImpl16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
         return this;
     }
 
+    @Override
+    public <T> Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> with(Field<T> field, T value) {
+        return (Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl17.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl17.java
index 8fa83e67c1..0ef6693a59 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl17.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl17.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record17;
@@ -52,6 +51,7 @@ import org.jooq.Record17;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends AbstractRecord implements InternalRecord, Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
 
     /**
@@ -355,6 +355,16 @@ class RecordImpl17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
         return this;
     }
 
+    @Override
+    public <T> Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> with(Field<T> field, T value) {
+        return (Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl18.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl18.java
index e74616c1c2..c3d6b5fb85 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl18.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl18.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record18;
@@ -52,6 +51,7 @@ import org.jooq.Record18;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends AbstractRecord implements InternalRecord, Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
 
     /**
@@ -371,6 +371,16 @@ class RecordImpl18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
         return this;
     }
 
+    @Override
+    public <T> Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> with(Field<T> field, T value) {
+        return (Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl19.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl19.java
index 2e903fd594..9ef4e112f8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl19.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl19.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record19;
@@ -52,6 +51,7 @@ import org.jooq.Record19;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends AbstractRecord implements InternalRecord, Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
 
     /**
@@ -387,6 +387,16 @@ class RecordImpl19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
         return this;
     }
 
+    @Override
+    public <T> Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> with(Field<T> field, T value) {
+        return (Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl2.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl2.java
index 42d13e229c..46972759a4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl2.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record2;
@@ -52,6 +51,7 @@ import org.jooq.Record2;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl2<T1, T2> extends AbstractRecord implements InternalRecord, Record2<T1, T2> {
 
     /**
@@ -115,6 +115,16 @@ class RecordImpl2<T1, T2> extends AbstractRecord implements InternalRecord, Reco
         return this;
     }
 
+    @Override
+    public <T> Record2<T1, T2> with(Field<T> field, T value) {
+        return (Record2<T1, T2>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record2<T1, T2> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record2<T1, T2>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl20.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl20.java
index 2c3e28db48..69cbd8241f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl20.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl20.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record20;
@@ -52,6 +51,7 @@ import org.jooq.Record20;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends AbstractRecord implements InternalRecord, Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> {
 
     /**
@@ -403,6 +403,16 @@ class RecordImpl20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
         return this;
     }
 
+    @Override
+    public <T> Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> with(Field<T> field, T value) {
+        return (Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl21.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl21.java
index 4d26206ca7..16f2d6b95c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl21.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl21.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record21;
@@ -52,6 +51,7 @@ import org.jooq.Record21;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends AbstractRecord implements InternalRecord, Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> {
 
     /**
@@ -419,6 +419,16 @@ class RecordImpl21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
         return this;
     }
 
+    @Override
+    public <T> Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> with(Field<T> field, T value) {
+        return (Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl22.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl22.java
index be2c2bb5f2..316c8657be 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl22.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl22.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record22;
@@ -52,6 +51,7 @@ import org.jooq.Record22;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractRecord implements InternalRecord, Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> {
 
     /**
@@ -435,6 +435,16 @@ class RecordImpl22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14,
         return this;
     }
 
+    @Override
+    public <T> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> with(Field<T> field, T value) {
+        return (Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl3.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl3.java
index a04eb95a66..e2cdf3e35e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl3.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl3.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record3;
@@ -52,6 +51,7 @@ import org.jooq.Record3;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl3<T1, T2, T3> extends AbstractRecord implements InternalRecord, Record3<T1, T2, T3> {
 
     /**
@@ -131,6 +131,16 @@ class RecordImpl3<T1, T2, T3> extends AbstractRecord implements InternalRecord,
         return this;
     }
 
+    @Override
+    public <T> Record3<T1, T2, T3> with(Field<T> field, T value) {
+        return (Record3<T1, T2, T3>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record3<T1, T2, T3> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record3<T1, T2, T3>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl4.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl4.java
index e642aa63a4..77663bb404 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl4.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl4.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record4;
@@ -52,6 +51,7 @@ import org.jooq.Record4;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl4<T1, T2, T3, T4> extends AbstractRecord implements InternalRecord, Record4<T1, T2, T3, T4> {
 
     /**
@@ -147,6 +147,16 @@ class RecordImpl4<T1, T2, T3, T4> extends AbstractRecord implements InternalReco
         return this;
     }
 
+    @Override
+    public <T> Record4<T1, T2, T3, T4> with(Field<T> field, T value) {
+        return (Record4<T1, T2, T3, T4>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record4<T1, T2, T3, T4> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record4<T1, T2, T3, T4>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl5.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl5.java
index a008713636..1c535e5929 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl5.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record5;
@@ -52,6 +51,7 @@ import org.jooq.Record5;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl5<T1, T2, T3, T4, T5> extends AbstractRecord implements InternalRecord, Record5<T1, T2, T3, T4, T5> {
 
     /**
@@ -163,6 +163,16 @@ class RecordImpl5<T1, T2, T3, T4, T5> extends AbstractRecord implements Internal
         return this;
     }
 
+    @Override
+    public <T> Record5<T1, T2, T3, T4, T5> with(Field<T> field, T value) {
+        return (Record5<T1, T2, T3, T4, T5>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record5<T1, T2, T3, T4, T5> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record5<T1, T2, T3, T4, T5>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl6.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl6.java
index ce4efbc1ae..c95372ec01 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl6.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl6.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record6;
@@ -52,6 +51,7 @@ import org.jooq.Record6;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl6<T1, T2, T3, T4, T5, T6> extends AbstractRecord implements InternalRecord, Record6<T1, T2, T3, T4, T5, T6> {
 
     /**
@@ -179,6 +179,16 @@ class RecordImpl6<T1, T2, T3, T4, T5, T6> extends AbstractRecord implements Inte
         return this;
     }
 
+    @Override
+    public <T> Record6<T1, T2, T3, T4, T5, T6> with(Field<T> field, T value) {
+        return (Record6<T1, T2, T3, T4, T5, T6>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record6<T1, T2, T3, T4, T5, T6> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record6<T1, T2, T3, T4, T5, T6>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl7.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl7.java
index d8f1285e74..f4e21e6812 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl7.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl7.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record7;
@@ -52,6 +51,7 @@ import org.jooq.Record7;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl7<T1, T2, T3, T4, T5, T6, T7> extends AbstractRecord implements InternalRecord, Record7<T1, T2, T3, T4, T5, T6, T7> {
 
     /**
@@ -195,6 +195,16 @@ class RecordImpl7<T1, T2, T3, T4, T5, T6, T7> extends AbstractRecord implements
         return this;
     }
 
+    @Override
+    public <T> Record7<T1, T2, T3, T4, T5, T6, T7> with(Field<T> field, T value) {
+        return (Record7<T1, T2, T3, T4, T5, T6, T7>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record7<T1, T2, T3, T4, T5, T6, T7> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record7<T1, T2, T3, T4, T5, T6, T7>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl8.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl8.java
index 5813730286..4c70d4bf60 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl8.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl8.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record8;
@@ -52,6 +51,7 @@ import org.jooq.Record8;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl8<T1, T2, T3, T4, T5, T6, T7, T8> extends AbstractRecord implements InternalRecord, Record8<T1, T2, T3, T4, T5, T6, T7, T8> {
 
     /**
@@ -211,6 +211,16 @@ class RecordImpl8<T1, T2, T3, T4, T5, T6, T7, T8> extends AbstractRecord impleme
         return this;
     }
 
+    @Override
+    public <T> Record8<T1, T2, T3, T4, T5, T6, T7, T8> with(Field<T> field, T value) {
+        return (Record8<T1, T2, T3, T4, T5, T6, T7, T8>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record8<T1, T2, T3, T4, T5, T6, T7, T8> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record8<T1, T2, T3, T4, T5, T6, T7, T8>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl9.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl9.java
index 1bb7187b53..3189c31668 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl9.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl9.java
@@ -37,8 +37,7 @@
  */
 package org.jooq.impl;
 
-import java.util.Collection;
-
+import org.jooq.Converter;
 import org.jooq.Field;
 import org.jooq.Record;
 import org.jooq.Record9;
@@ -52,6 +51,7 @@ import org.jooq.Record9;
  *
  * @author Lukas Eder
  */
+@SuppressWarnings({ "unchecked" })
 class RecordImpl9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends AbstractRecord implements InternalRecord, Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> {
 
     /**
@@ -227,6 +227,16 @@ class RecordImpl9<T1, T2, T3, T4, T5, T6, T7, T8, T9> extends AbstractRecord imp
         return this;
     }
 
+    @Override
+    public <T> Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> with(Field<T> field, T value) {
+        return (Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>) super.with(field, value);
+    }
+
+    @Override
+    public <T, U> Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9> with(Field<T> field, U value, Converter<? extends T, ? super U> converter) {
+        return (Record9<T1, T2, T3, T4, T5, T6, T7, T8, T9>) super.with(field, value, converter);
+    }
+
     @Override
     public final T1 component1() {
         return value1();