diff --git a/jOOQ/src/main/java/org/jooq/Rows.java b/jOOQ/src/main/java/org/jooq/Rows.java
index d4a49bcffd..1c0380b62e 100644
--- a/jOOQ/src/main/java/org/jooq/Rows.java
+++ b/jOOQ/src/main/java/org/jooq/Rows.java
@@ -61,7 +61,7 @@ public final class Rows {
      */
     @SafeVarargs
     public static <T> Collector<T, ?, RowN[]> collectingArray(
-        Function<? super T, ?>... functions
+        Function<? super T, ? extends Field<?>>... functions
     ) {
         return Collectors.collectingAndThen(collecting(functions), l -> l.toArray(new RowN[0]));
     }
@@ -70,8 +70,8 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link RowN}.
      */
     @SafeVarargs
-    public static <T> Collector<T, ?, List<RowN>> collecting(
-        Function<? super T, ?>... functions
+    public static <T, T1> Collector<T, ?, List<RowN>> collecting(
+        Function<? super T, ? extends Field<?>>... functions
     ) {
         return Collector.of(
             ArrayList::new,
@@ -90,7 +90,7 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1> Collector<T, ?, Row1<T1>[]> collectingArray(
-        Function<? super T, ? extends T1> f1
+        Function<? super T, ? extends Field<T1>> f1
     ) {
         return Collectors.collectingAndThen(collecting(f1), l -> l.toArray(new Row1[0]));
     }
@@ -99,7 +99,7 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row1}.
      */
     public static <T, T1> Collector<T, ?, List<Row1<T1>>> collecting(
-        Function<? super T, ? extends T1> f1
+        Function<? super T, ? extends Field<T1>> f1
     ) {
         return Collector.of(
             ArrayList::new,
@@ -116,8 +116,8 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2> Collector<T, ?, Row2<T1, T2>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2), l -> l.toArray(new Row2[0]));
     }
@@ -126,8 +126,8 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row2}.
      */
     public static <T, T1, T2> Collector<T, ?, List<Row2<T1, T2>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2
     ) {
         return Collector.of(
             ArrayList::new,
@@ -144,9 +144,9 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3> Collector<T, ?, Row3<T1, T2, T3>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3), l -> l.toArray(new Row3[0]));
     }
@@ -155,9 +155,9 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row3}.
      */
     public static <T, T1, T2, T3> Collector<T, ?, List<Row3<T1, T2, T3>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3
     ) {
         return Collector.of(
             ArrayList::new,
@@ -174,10 +174,10 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4> Collector<T, ?, Row4<T1, T2, T3, T4>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4), l -> l.toArray(new Row4[0]));
     }
@@ -186,10 +186,10 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row4}.
      */
     public static <T, T1, T2, T3, T4> Collector<T, ?, List<Row4<T1, T2, T3, T4>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4
     ) {
         return Collector.of(
             ArrayList::new,
@@ -206,11 +206,11 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5> Collector<T, ?, Row5<T1, T2, T3, T4, T5>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5), l -> l.toArray(new Row5[0]));
     }
@@ -219,11 +219,11 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row5}.
      */
     public static <T, T1, T2, T3, T4, T5> Collector<T, ?, List<Row5<T1, T2, T3, T4, T5>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5
     ) {
         return Collector.of(
             ArrayList::new,
@@ -240,12 +240,12 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6> Collector<T, ?, Row6<T1, T2, T3, T4, T5, T6>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6), l -> l.toArray(new Row6[0]));
     }
@@ -254,12 +254,12 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row6}.
      */
     public static <T, T1, T2, T3, T4, T5, T6> Collector<T, ?, List<Row6<T1, T2, T3, T4, T5, T6>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6
     ) {
         return Collector.of(
             ArrayList::new,
@@ -276,13 +276,13 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7> Collector<T, ?, Row7<T1, T2, T3, T4, T5, T6, T7>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7), l -> l.toArray(new Row7[0]));
     }
@@ -291,13 +291,13 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row7}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7> Collector<T, ?, List<Row7<T1, T2, T3, T4, T5, T6, T7>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7
     ) {
         return Collector.of(
             ArrayList::new,
@@ -314,14 +314,14 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8> Collector<T, ?, Row8<T1, T2, T3, T4, T5, T6, T7, T8>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8), l -> l.toArray(new Row8[0]));
     }
@@ -330,14 +330,14 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row8}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8> Collector<T, ?, List<Row8<T1, T2, T3, T4, T5, T6, T7, T8>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8
     ) {
         return Collector.of(
             ArrayList::new,
@@ -354,15 +354,15 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9> Collector<T, ?, Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9), l -> l.toArray(new Row9[0]));
     }
@@ -371,15 +371,15 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row9}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9> Collector<T, ?, List<Row9<T1, T2, T3, T4, T5, T6, T7, T8, T9>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9
     ) {
         return Collector.of(
             ArrayList::new,
@@ -396,16 +396,16 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Collector<T, ?, Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10), l -> l.toArray(new Row10[0]));
     }
@@ -414,16 +414,16 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row10}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Collector<T, ?, List<Row10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10
     ) {
         return Collector.of(
             ArrayList::new,
@@ -440,17 +440,17 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Collector<T, ?, Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11), l -> l.toArray(new Row11[0]));
     }
@@ -459,17 +459,17 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row11}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> Collector<T, ?, List<Row11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11
     ) {
         return Collector.of(
             ArrayList::new,
@@ -486,18 +486,18 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Collector<T, ?, Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12), l -> l.toArray(new Row12[0]));
     }
@@ -506,18 +506,18 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row12}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> Collector<T, ?, List<Row12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12
     ) {
         return Collector.of(
             ArrayList::new,
@@ -534,19 +534,19 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Collector<T, ?, Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13), l -> l.toArray(new Row13[0]));
     }
@@ -555,19 +555,19 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row13}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> Collector<T, ?, List<Row13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13
     ) {
         return Collector.of(
             ArrayList::new,
@@ -584,20 +584,20 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Collector<T, ?, Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14), l -> l.toArray(new Row14[0]));
     }
@@ -606,20 +606,20 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row14}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> Collector<T, ?, List<Row14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14
     ) {
         return Collector.of(
             ArrayList::new,
@@ -636,21 +636,21 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Collector<T, ?, Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15), l -> l.toArray(new Row15[0]));
     }
@@ -659,21 +659,21 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row15}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> Collector<T, ?, List<Row15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15
     ) {
         return Collector.of(
             ArrayList::new,
@@ -690,22 +690,22 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Collector<T, ?, Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16), l -> l.toArray(new Row16[0]));
     }
@@ -714,22 +714,22 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row16}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> Collector<T, ?, List<Row16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16
     ) {
         return Collector.of(
             ArrayList::new,
@@ -746,23 +746,23 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> Collector<T, ?, Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17), l -> l.toArray(new Row17[0]));
     }
@@ -771,23 +771,23 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row17}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> Collector<T, ?, List<Row17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17
     ) {
         return Collector.of(
             ArrayList::new,
@@ -804,24 +804,24 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> Collector<T, ?, Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18), l -> l.toArray(new Row18[0]));
     }
@@ -830,24 +830,24 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row18}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> Collector<T, ?, List<Row18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18
     ) {
         return Collector.of(
             ArrayList::new,
@@ -864,25 +864,25 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> Collector<T, ?, Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18,
-        Function<? super T, ? extends T19> f19
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18,
+        Function<? super T, ? extends Field<T19>> f19
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19), l -> l.toArray(new Row19[0]));
     }
@@ -891,25 +891,25 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row19}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> Collector<T, ?, List<Row19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18,
-        Function<? super T, ? extends T19> f19
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18,
+        Function<? super T, ? extends Field<T19>> f19
     ) {
         return Collector.of(
             ArrayList::new,
@@ -926,26 +926,26 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> Collector<T, ?, Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18,
-        Function<? super T, ? extends T19> f19,
-        Function<? super T, ? extends T20> f20
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18,
+        Function<? super T, ? extends Field<T19>> f19,
+        Function<? super T, ? extends Field<T20>> f20
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20), l -> l.toArray(new Row20[0]));
     }
@@ -954,26 +954,26 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row20}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> Collector<T, ?, List<Row20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18,
-        Function<? super T, ? extends T19> f19,
-        Function<? super T, ? extends T20> f20
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18,
+        Function<? super T, ? extends Field<T19>> f19,
+        Function<? super T, ? extends Field<T20>> f20
     ) {
         return Collector.of(
             ArrayList::new,
@@ -990,27 +990,27 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> Collector<T, ?, Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18,
-        Function<? super T, ? extends T19> f19,
-        Function<? super T, ? extends T20> f20,
-        Function<? super T, ? extends T21> f21
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18,
+        Function<? super T, ? extends Field<T19>> f19,
+        Function<? super T, ? extends Field<T20>> f20,
+        Function<? super T, ? extends Field<T21>> f21
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21), l -> l.toArray(new Row21[0]));
     }
@@ -1019,27 +1019,27 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row21}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> Collector<T, ?, List<Row21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18,
-        Function<? super T, ? extends T19> f19,
-        Function<? super T, ? extends T20> f20,
-        Function<? super T, ? extends T21> f21
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18,
+        Function<? super T, ? extends Field<T19>> f19,
+        Function<? super T, ? extends Field<T20>> f20,
+        Function<? super T, ? extends Field<T21>> f21
     ) {
         return Collector.of(
             ArrayList::new,
@@ -1056,28 +1056,28 @@ public final class Rows {
      */
     @SuppressWarnings("unchecked")
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Collector<T, ?, Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>[]> collectingArray(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18,
-        Function<? super T, ? extends T19> f19,
-        Function<? super T, ? extends T20> f20,
-        Function<? super T, ? extends T21> f21,
-        Function<? super T, ? extends T22> f22
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18,
+        Function<? super T, ? extends Field<T19>> f19,
+        Function<? super T, ? extends Field<T20>> f20,
+        Function<? super T, ? extends Field<T21>> f21,
+        Function<? super T, ? extends Field<T22>> f22
     ) {
         return Collectors.collectingAndThen(collecting(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14, f15, f16, f17, f18, f19, f20, f21, f22), l -> l.toArray(new Row22[0]));
     }
@@ -1086,28 +1086,28 @@ public final class Rows {
      * Create a collector that can collect into a list of {@link Row22}.
      */
     public static <T, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> Collector<T, ?, List<Row22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>>> collecting(
-        Function<? super T, ? extends T1> f1,
-        Function<? super T, ? extends T2> f2,
-        Function<? super T, ? extends T3> f3,
-        Function<? super T, ? extends T4> f4,
-        Function<? super T, ? extends T5> f5,
-        Function<? super T, ? extends T6> f6,
-        Function<? super T, ? extends T7> f7,
-        Function<? super T, ? extends T8> f8,
-        Function<? super T, ? extends T9> f9,
-        Function<? super T, ? extends T10> f10,
-        Function<? super T, ? extends T11> f11,
-        Function<? super T, ? extends T12> f12,
-        Function<? super T, ? extends T13> f13,
-        Function<? super T, ? extends T14> f14,
-        Function<? super T, ? extends T15> f15,
-        Function<? super T, ? extends T16> f16,
-        Function<? super T, ? extends T17> f17,
-        Function<? super T, ? extends T18> f18,
-        Function<? super T, ? extends T19> f19,
-        Function<? super T, ? extends T20> f20,
-        Function<? super T, ? extends T21> f21,
-        Function<? super T, ? extends T22> f22
+        Function<? super T, ? extends Field<T1>> f1,
+        Function<? super T, ? extends Field<T2>> f2,
+        Function<? super T, ? extends Field<T3>> f3,
+        Function<? super T, ? extends Field<T4>> f4,
+        Function<? super T, ? extends Field<T5>> f5,
+        Function<? super T, ? extends Field<T6>> f6,
+        Function<? super T, ? extends Field<T7>> f7,
+        Function<? super T, ? extends Field<T8>> f8,
+        Function<? super T, ? extends Field<T9>> f9,
+        Function<? super T, ? extends Field<T10>> f10,
+        Function<? super T, ? extends Field<T11>> f11,
+        Function<? super T, ? extends Field<T12>> f12,
+        Function<? super T, ? extends Field<T13>> f13,
+        Function<? super T, ? extends Field<T14>> f14,
+        Function<? super T, ? extends Field<T15>> f15,
+        Function<? super T, ? extends Field<T16>> f16,
+        Function<? super T, ? extends Field<T17>> f17,
+        Function<? super T, ? extends Field<T18>> f18,
+        Function<? super T, ? extends Field<T19>> f19,
+        Function<? super T, ? extends Field<T20>> f20,
+        Function<? super T, ? extends Field<T21>> f21,
+        Function<? super T, ? extends Field<T22>> f22
     ) {
         return Collector.of(
             ArrayList::new,