diff --git a/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java b/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
index afa222435f..b88390e2f4 100644
--- a/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
+++ b/jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java
@@ -296,17 +296,17 @@ public class FactoryProxy implements FactoryOperations, MethodInterceptor {
     }
 
     @Override
-    public final <R extends TableRecord<R>> MergeUsingStep<R> mergeInto(Table<R> table) {
+    public final <R extends Record> MergeUsingStep<R> mergeInto(Table<R> table) {
         return getDelegate().mergeInto(table);
     }
 
     @Override
-    public final <R extends TableRecord<R>> DeleteQuery<R> deleteQuery(Table<R> table) {
+    public final <R extends Record> DeleteQuery<R> deleteQuery(Table<R> table) {
         return getDelegate().deleteQuery(table);
     }
 
     @Override
-    public final <R extends TableRecord<R>> DeleteWhereStep<R> delete(Table<R> table) {
+    public final <R extends Record> DeleteWhereStep<R> delete(Table<R> table) {
         return getDelegate().delete(table);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/Delete.java b/jOOQ/src/main/java/org/jooq/Delete.java
index 17722612f5..ced7fc231a 100644
--- a/jOOQ/src/main/java/org/jooq/Delete.java
+++ b/jOOQ/src/main/java/org/jooq/Delete.java
@@ -40,6 +40,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface Delete<R extends TableRecord<R>> extends Query {
+public interface Delete<R extends Record> extends Query {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
index a53b2535fa..8be3ded831 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
@@ -50,7 +50,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
-public interface DeleteConditionStep<R extends TableRecord<R>> extends DeleteFinalStep<R> {
+public interface DeleteConditionStep<R extends Record> extends DeleteFinalStep<R> {
 
     /**
      * Combine the currently assembled conditions with another one using the
diff --git a/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java b/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
index b5f80f7250..64bb165550 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
@@ -48,6 +48,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface DeleteFinalStep<R extends TableRecord<R>> extends Delete<R> {
+public interface DeleteFinalStep<R extends Record> extends Delete<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DeleteQuery.java b/jOOQ/src/main/java/org/jooq/DeleteQuery.java
index 9083395ea8..013961f99c 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteQuery.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteQuery.java
@@ -42,6 +42,6 @@ package org.jooq;
  * @param <R> The record type of the table being deleted from
  * @author Lukas Eder
  */
-public interface DeleteQuery<R extends TableRecord<R>> extends ConditionProvider, Delete<R> {
+public interface DeleteQuery<R extends Record> extends ConditionProvider, Delete<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
index c40df7086c..b42f61ab57 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
@@ -52,7 +52,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
-public interface DeleteWhereStep<R extends TableRecord<R>> extends DeleteFinalStep<R> {
+public interface DeleteWhereStep<R extends Record> extends DeleteFinalStep<R> {
 
     /**
      * Add conditions to the query
diff --git a/jOOQ/src/main/java/org/jooq/FactoryOperations.java b/jOOQ/src/main/java/org/jooq/FactoryOperations.java
index 5e3b492f43..9d365d50cd 100644
--- a/jOOQ/src/main/java/org/jooq/FactoryOperations.java
+++ b/jOOQ/src/main/java/org/jooq/FactoryOperations.java
@@ -467,7 +467,7 @@ public interface FactoryOperations extends Configuration {
      *       .execute();
      * </pre></code>
      */
-    <R extends TableRecord<R>> MergeUsingStep<R> mergeInto(Table<R> table);
+    <R extends Record> MergeUsingStep<R> mergeInto(Table<R> table);
 
     /**
      * Create a new {@link DeleteQuery}
@@ -475,7 +475,7 @@ public interface FactoryOperations extends Configuration {
      * @param table The table to delete data from
      * @return The new {@link DeleteQuery}
      */
-    <R extends TableRecord<R>> DeleteQuery<R> deleteQuery(Table<R> table);
+    <R extends Record> DeleteQuery<R> deleteQuery(Table<R> table);
 
     /**
      * Create a new DSL delete statement.
@@ -488,7 +488,7 @@ public interface FactoryOperations extends Configuration {
      *       .execute();
      * </pre></code>
      */
-    <R extends TableRecord<R>> DeleteWhereStep<R> delete(Table<R> table);
+    <R extends Record> DeleteWhereStep<R> delete(Table<R> table);
 
     /**
      * Execute a set of queries in batch mode (without bind values).
diff --git a/jOOQ/src/main/java/org/jooq/Merge.java b/jOOQ/src/main/java/org/jooq/Merge.java
index e830c15327..e62a290a85 100644
--- a/jOOQ/src/main/java/org/jooq/Merge.java
+++ b/jOOQ/src/main/java/org/jooq/Merge.java
@@ -40,6 +40,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface Merge<R extends TableRecord<R>> extends Query {
+public interface Merge<R extends Record> extends Query {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/MergeFinalStep.java b/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
index e3a6418984..7d8b1345b2 100644
--- a/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
@@ -54,6 +54,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface MergeFinalStep<R extends TableRecord<R>> extends Merge<R> {
+public interface MergeFinalStep<R extends Record> extends Merge<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedSetMoreStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedSetMoreStep.java
index 6bceca47e4..52d3ba6161 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedSetMoreStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedSetMoreStep.java
@@ -54,6 +54,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface MergeMatchedSetMoreStep<R extends TableRecord<R>> extends MergeMatchedSetStep<R>, MergeNotMatchedStep<R> {
+public interface MergeMatchedSetMoreStep<R extends Record> extends MergeMatchedSetStep<R>, MergeNotMatchedStep<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedSetStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedSetStep.java
index a3c07ac9c4..4981b8b109 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedSetStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedSetStep.java
@@ -56,7 +56,7 @@ import java.util.Map;
  *
  * @author Lukas Eder
  */
-public interface MergeMatchedSetStep<R extends TableRecord<R>> {
+public interface MergeMatchedSetStep<R extends Record> {
 
     /**
      * Set values for <code>UPDATE</code> in the <code>MERGE</code> statement's
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedStep.java
index 59790ec975..4aa8b4e6de 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedStep.java
@@ -54,7 +54,7 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface MergeMatchedStep<R extends TableRecord<R>> {
+public interface MergeMatchedStep<R extends Record> {
 
     /**
      * Add the <code>WHEN MATCHED THEN UPDATE</code> clause to the
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedStep.java
index 781f8b8ebb..f917a96235 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedStep.java
@@ -56,7 +56,7 @@ import java.util.Collection;
  *
  * @author Lukas Eder
  */
-public interface MergeNotMatchedStep<R extends TableRecord<R>> {
+public interface MergeNotMatchedStep<R extends Record> {
 
     /**
      * Add the <code>WHEN NOT MATCHED THEN INSERT</code> clause to the
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedValuesStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedValuesStep.java
index 7b07f1b38e..7d1cfb3938 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedValuesStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedValuesStep.java
@@ -56,7 +56,7 @@ import java.util.Collection;
  *
  * @author Lukas Eder
  */
-public interface MergeNotMatchedValuesStep<R extends TableRecord<R>> {
+public interface MergeNotMatchedValuesStep<R extends Record> {
 
     /**
      * Set <code>VALUES</code> for <code>INSERT</code> in the <code>MERGE</code>
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
index e1e801884a..592e2dd598 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
@@ -56,7 +56,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
-public interface MergeOnConditionStep<R extends TableRecord<R>> extends MergeMatchedStep<R> {
+public interface MergeOnConditionStep<R extends Record> extends MergeMatchedStep<R> {
 
     /**
      * Combine the currently assembled conditions with another one using the
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnStep.java b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
index ea609fe0a6..5708c9fe94 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
@@ -56,7 +56,7 @@ import org.jooq.impl.Factory;
  *
  * @author Lukas Eder
  */
-public interface MergeOnStep<R extends TableRecord<R>> {
+public interface MergeOnStep<R extends Record> {
 
     /**
      * Provide join conditions and proceed to the next step
diff --git a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
index eabe03f44c..124f092be2 100644
--- a/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeUsingStep.java
@@ -54,7 +54,7 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface MergeUsingStep<R extends TableRecord<R>> {
+public interface MergeUsingStep<R extends Record> {
 
     /**
      * Add the <code>USING</code> clause to the <code>MERGE</code> statement
diff --git a/jOOQ/src/main/java/org/jooq/Update.java b/jOOQ/src/main/java/org/jooq/Update.java
index 99e3240f52..6dbd7a3184 100644
--- a/jOOQ/src/main/java/org/jooq/Update.java
+++ b/jOOQ/src/main/java/org/jooq/Update.java
@@ -40,6 +40,6 @@ package org.jooq;
  *
  * @author Lukas Eder
  */
-public interface Update<R extends TableRecord<R>> extends Query {
+public interface Update<R extends Record> extends Query {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
index bbaefe3d35..05153d801e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
@@ -46,14 +46,14 @@ import org.jooq.Configuration;
 import org.jooq.DeleteConditionStep;
 import org.jooq.DeleteWhereStep;
 import org.jooq.Operator;
+import org.jooq.Record;
 import org.jooq.Select;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 
 /**
  * @author Lukas Eder
  */
-class DeleteImpl<R extends TableRecord<R>>
+class DeleteImpl<R extends Record>
     extends AbstractDelegatingQueryPart<DeleteQueryImpl<R>>
     implements
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
index 89bdbdc0fc..ad187f92bf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
@@ -45,14 +45,14 @@ import org.jooq.Condition;
 import org.jooq.Configuration;
 import org.jooq.DeleteQuery;
 import org.jooq.Operator;
+import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Table;
-import org.jooq.TableRecord;
 
 /**
  * @author Lukas Eder
  */
-class DeleteQueryImpl<R extends TableRecord<R>> extends AbstractQuery implements DeleteQuery<R> {
+class DeleteQueryImpl<R extends Record> extends AbstractQuery implements DeleteQuery<R> {
 
     private static final long           serialVersionUID = -1943687511774150929L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/Factory.java
index 4cb4290bb9..4a39973971 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Factory.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Factory.java
@@ -980,7 +980,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> MergeUsingStep<R> mergeInto(Table<R> table) {
+    public final <R extends Record> MergeUsingStep<R> mergeInto(Table<R> table) {
         return new MergeImpl<R>(this, table);
     }
 
@@ -988,7 +988,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> DeleteQuery<R> deleteQuery(Table<R> table) {
+    public final <R extends Record> DeleteQuery<R> deleteQuery(Table<R> table) {
         return new DeleteQueryImpl<R>(this, table);
     }
 
@@ -996,7 +996,7 @@ public class Factory implements FactoryOperations {
      * {@inheritDoc}
      */
     @Override
-    public final <R extends TableRecord<R>> DeleteWhereStep<R> delete(Table<R> table) {
+    public final <R extends Record> DeleteWhereStep<R> delete(Table<R> table) {
         return new DeleteImpl<R>(this, table);
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index ee9cec81e7..09e4bc6d09 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -59,17 +59,17 @@ import org.jooq.MergeOnConditionStep;
 import org.jooq.MergeOnStep;
 import org.jooq.MergeUsingStep;
 import org.jooq.Operator;
+import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Select;
 import org.jooq.Table;
 import org.jooq.TableLike;
-import org.jooq.TableRecord;
 import org.jooq.tools.StringUtils;
 
 /**
  * @author Lukas Eder
  */
-class MergeImpl<R extends TableRecord<R>> extends AbstractQuery
+class MergeImpl<R extends Record> extends AbstractQuery
 implements
 
     // Cascading interface implementations for Merge behaviour