diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
index d7dae9e2ea..fe66f84726 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDMLQuery.java
@@ -291,7 +291,7 @@ abstract class AbstractDMLQuery<R extends Record> extends AbstractRowCountQuery
         return table;
     }
 
-    final Table<?> table(Context<?> ctx) {
+    final Table<?> table(Scope ctx) {
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/InlineDerivedTable.java b/jOOQ/src/main/java/org/jooq/impl/InlineDerivedTable.java
index cb8eb37f89..f3c7e5a4a8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InlineDerivedTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InlineDerivedTable.java
@@ -43,25 +43,15 @@ import static org.jooq.impl.DSL.table;
 import static org.jooq.impl.Tools.anyMatch;
 import static org.jooq.tools.StringUtils.defaultIfNull;
 
-import java.util.List;
-
-import org.jooq.Check;
 import org.jooq.Condition;
 import org.jooq.Context;
-import org.jooq.ForeignKey;
-import org.jooq.Identity;
-import org.jooq.Index;
 import org.jooq.QueryPart;
 import org.jooq.Record;
 // ...
+import org.jooq.Scope;
 import org.jooq.Select;
 import org.jooq.Table;
-import org.jooq.TableField;
 // ...
-import org.jooq.UniqueKey;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Lukas Eder
@@ -212,7 +202,7 @@ final class InlineDerivedTable<R extends Record> extends DerivedTable<R> {
             return table;
     }
 
-    static final <R extends Record> Table<R> inlineDerivedTable(Context<?> ctx, Table<R> t) {
+    static final <R extends Record> Table<R> inlineDerivedTable(Scope ctx, Table<R> t) {
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
index 02052b5e35..9fde1e4d3d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
@@ -1215,6 +1215,12 @@ implements
 
 
 
+
+
+
+
+
+