diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java
index d4c05e1303..9064d369e2 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Indexes.java
@@ -12,7 +12,7 @@ import org.jooq.example.jpa.jooq.tables.Actor;
 import org.jooq.example.jpa.jooq.tables.Film;
 import org.jooq.example.jpa.jooq.tables.FilmActor;
 import org.jooq.example.jpa.jooq.tables.Language;
-import org.jooq.impl.AbstractKeys;
+import org.jooq.impl.Internal;
 
 
 /**
@@ -44,13 +44,13 @@ public class Indexes {
     // [#1459] distribute members to avoid static initialisers > 64kb
     // -------------------------------------------------------------------------
 
-    private static class Indexes0 extends AbstractKeys {
-        public static Index PRIMARY_KEY_3 = createIndex("PRIMARY_KEY_3", Actor.ACTOR, new OrderField[] { Actor.ACTOR.ACTORID }, true);
-        public static Index FKD2YJC1RU34H1SMWLA3FX7B6NX_INDEX_2 = createIndex("FKD2YJC1RU34H1SMWLA3FX7B6NX_INDEX_2", Film.FILM, new OrderField[] { Film.FILM.LANGUAGE_LANGUAGEID }, false);
-        public static Index FKN2UB730RPO5B5E9X6U2LWL9FT_INDEX_2 = createIndex("FKN2UB730RPO5B5E9X6U2LWL9FT_INDEX_2", Film.FILM, new OrderField[] { Film.FILM.ORIGINALLANGUAGE_LANGUAGEID }, false);
-        public static Index PRIMARY_KEY_2 = createIndex("PRIMARY_KEY_2", Film.FILM, new OrderField[] { Film.FILM.FILMID }, true);
-        public static Index FK43SD2F45W7YN0GAXQ94EHTWT2_INDEX_7 = createIndex("FK43SD2F45W7YN0GAXQ94EHTWT2_INDEX_7", FilmActor.FILM_ACTOR, new OrderField[] { FilmActor.FILM_ACTOR.ACTORS_ACTORID }, false);
-        public static Index PRIMARY_KEY_7 = createIndex("PRIMARY_KEY_7", FilmActor.FILM_ACTOR, new OrderField[] { FilmActor.FILM_ACTOR.FILMS_FILMID, FilmActor.FILM_ACTOR.ACTORS_ACTORID }, true);
-        public static Index PRIMARY_KEY_C = createIndex("PRIMARY_KEY_C", Language.LANGUAGE, new OrderField[] { Language.LANGUAGE.LANGUAGEID }, true);
+    private static class Indexes0 {
+        public static Index PRIMARY_KEY_3 = Internal.createIndex("PRIMARY_KEY_3", Actor.ACTOR, new OrderField[] { Actor.ACTOR.ACTORID }, true);
+        public static Index FKD2YJC1RU34H1SMWLA3FX7B6NX_INDEX_2 = Internal.createIndex("FKD2YJC1RU34H1SMWLA3FX7B6NX_INDEX_2", Film.FILM, new OrderField[] { Film.FILM.LANGUAGE_LANGUAGEID }, false);
+        public static Index FKN2UB730RPO5B5E9X6U2LWL9FT_INDEX_2 = Internal.createIndex("FKN2UB730RPO5B5E9X6U2LWL9FT_INDEX_2", Film.FILM, new OrderField[] { Film.FILM.ORIGINALLANGUAGE_LANGUAGEID }, false);
+        public static Index PRIMARY_KEY_2 = Internal.createIndex("PRIMARY_KEY_2", Film.FILM, new OrderField[] { Film.FILM.FILMID }, true);
+        public static Index FK43SD2F45W7YN0GAXQ94EHTWT2_INDEX_7 = Internal.createIndex("FK43SD2F45W7YN0GAXQ94EHTWT2_INDEX_7", FilmActor.FILM_ACTOR, new OrderField[] { FilmActor.FILM_ACTOR.ACTORS_ACTORID }, false);
+        public static Index PRIMARY_KEY_7 = Internal.createIndex("PRIMARY_KEY_7", FilmActor.FILM_ACTOR, new OrderField[] { FilmActor.FILM_ACTOR.FILMS_FILMID, FilmActor.FILM_ACTOR.ACTORS_ACTORID }, true);
+        public static Index PRIMARY_KEY_C = Internal.createIndex("PRIMARY_KEY_C", Language.LANGUAGE, new OrderField[] { Language.LANGUAGE.LANGUAGEID }, true);
     }
 }
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java
index 4116667f7d..1407cfcacd 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/Keys.java
@@ -17,7 +17,7 @@ import org.jooq.example.jpa.jooq.tables.records.ActorRecord;
 import org.jooq.example.jpa.jooq.tables.records.FilmActorRecord;
 import org.jooq.example.jpa.jooq.tables.records.FilmRecord;
 import org.jooq.example.jpa.jooq.tables.records.LanguageRecord;
-import org.jooq.impl.AbstractKeys;
+import org.jooq.impl.Internal;
 
 
 /**
@@ -64,23 +64,23 @@ public class Keys {
     // [#1459] distribute members to avoid static initialisers > 64kb
     // -------------------------------------------------------------------------
 
-    private static class Identities0 extends AbstractKeys {
-        public static Identity<ActorRecord, Integer> IDENTITY_ACTOR = createIdentity(Actor.ACTOR, Actor.ACTOR.ACTORID);
-        public static Identity<FilmRecord, Integer> IDENTITY_FILM = createIdentity(Film.FILM, Film.FILM.FILMID);
-        public static Identity<LanguageRecord, Integer> IDENTITY_LANGUAGE = createIdentity(Language.LANGUAGE, Language.LANGUAGE.LANGUAGEID);
+    private static class Identities0 {
+        public static Identity<ActorRecord, Integer> IDENTITY_ACTOR = Internal.createIdentity(Actor.ACTOR, Actor.ACTOR.ACTORID);
+        public static Identity<FilmRecord, Integer> IDENTITY_FILM = Internal.createIdentity(Film.FILM, Film.FILM.FILMID);
+        public static Identity<LanguageRecord, Integer> IDENTITY_LANGUAGE = Internal.createIdentity(Language.LANGUAGE, Language.LANGUAGE.LANGUAGEID);
     }
 
-    private static class UniqueKeys0 extends AbstractKeys {
-        public static final UniqueKey<ActorRecord> CONSTRAINT_3 = createUniqueKey(Actor.ACTOR, "CONSTRAINT_3", Actor.ACTOR.ACTORID);
-        public static final UniqueKey<FilmRecord> CONSTRAINT_2 = createUniqueKey(Film.FILM, "CONSTRAINT_2", Film.FILM.FILMID);
-        public static final UniqueKey<FilmActorRecord> CONSTRAINT_7 = createUniqueKey(FilmActor.FILM_ACTOR, "CONSTRAINT_7", FilmActor.FILM_ACTOR.FILMS_FILMID, FilmActor.FILM_ACTOR.ACTORS_ACTORID);
-        public static final UniqueKey<LanguageRecord> CONSTRAINT_C = createUniqueKey(Language.LANGUAGE, "CONSTRAINT_C", Language.LANGUAGE.LANGUAGEID);
+    private static class UniqueKeys0 {
+        public static final UniqueKey<ActorRecord> CONSTRAINT_3 = Internal.createUniqueKey(Actor.ACTOR, "CONSTRAINT_3", Actor.ACTOR.ACTORID);
+        public static final UniqueKey<FilmRecord> CONSTRAINT_2 = Internal.createUniqueKey(Film.FILM, "CONSTRAINT_2", Film.FILM.FILMID);
+        public static final UniqueKey<FilmActorRecord> CONSTRAINT_7 = Internal.createUniqueKey(FilmActor.FILM_ACTOR, "CONSTRAINT_7", FilmActor.FILM_ACTOR.FILMS_FILMID, FilmActor.FILM_ACTOR.ACTORS_ACTORID);
+        public static final UniqueKey<LanguageRecord> CONSTRAINT_C = Internal.createUniqueKey(Language.LANGUAGE, "CONSTRAINT_C", Language.LANGUAGE.LANGUAGEID);
     }
 
-    private static class ForeignKeys0 extends AbstractKeys {
-        public static final ForeignKey<FilmRecord, LanguageRecord> FKD2YJC1RU34H1SMWLA3FX7B6NX = createForeignKey(org.jooq.example.jpa.jooq.Keys.CONSTRAINT_C, Film.FILM, "FKD2YJC1RU34H1SMWLA3FX7B6NX", Film.FILM.LANGUAGE_LANGUAGEID);
-        public static final ForeignKey<FilmRecord, LanguageRecord> FKN2UB730RPO5B5E9X6U2LWL9FT = createForeignKey(org.jooq.example.jpa.jooq.Keys.CONSTRAINT_C, Film.FILM, "FKN2UB730RPO5B5E9X6U2LWL9FT", Film.FILM.ORIGINALLANGUAGE_LANGUAGEID);
-        public static final ForeignKey<FilmActorRecord, FilmRecord> FK3FSUXQ0JJ1XONRE7BHROOPVBX = createForeignKey(org.jooq.example.jpa.jooq.Keys.CONSTRAINT_2, FilmActor.FILM_ACTOR, "FK3FSUXQ0JJ1XONRE7BHROOPVBX", FilmActor.FILM_ACTOR.FILMS_FILMID);
-        public static final ForeignKey<FilmActorRecord, ActorRecord> FK43SD2F45W7YN0GAXQ94EHTWT2 = createForeignKey(org.jooq.example.jpa.jooq.Keys.CONSTRAINT_3, FilmActor.FILM_ACTOR, "FK43SD2F45W7YN0GAXQ94EHTWT2", FilmActor.FILM_ACTOR.ACTORS_ACTORID);
+    private static class ForeignKeys0 {
+        public static final ForeignKey<FilmRecord, LanguageRecord> FKD2YJC1RU34H1SMWLA3FX7B6NX = Internal.createForeignKey(org.jooq.example.jpa.jooq.Keys.CONSTRAINT_C, Film.FILM, "FKD2YJC1RU34H1SMWLA3FX7B6NX", Film.FILM.LANGUAGE_LANGUAGEID);
+        public static final ForeignKey<FilmRecord, LanguageRecord> FKN2UB730RPO5B5E9X6U2LWL9FT = Internal.createForeignKey(org.jooq.example.jpa.jooq.Keys.CONSTRAINT_C, Film.FILM, "FKN2UB730RPO5B5E9X6U2LWL9FT", Film.FILM.ORIGINALLANGUAGE_LANGUAGEID);
+        public static final ForeignKey<FilmActorRecord, FilmRecord> FK3FSUXQ0JJ1XONRE7BHROOPVBX = Internal.createForeignKey(org.jooq.example.jpa.jooq.Keys.CONSTRAINT_2, FilmActor.FILM_ACTOR, "FK3FSUXQ0JJ1XONRE7BHROOPVBX", FilmActor.FILM_ACTOR.FILMS_FILMID);
+        public static final ForeignKey<FilmActorRecord, ActorRecord> FK43SD2F45W7YN0GAXQ94EHTWT2 = Internal.createForeignKey(org.jooq.example.jpa.jooq.Keys.CONSTRAINT_3, FilmActor.FILM_ACTOR, "FK43SD2F45W7YN0GAXQ94EHTWT2", FilmActor.FILM_ACTOR.ACTORS_ACTORID);
     }
 }
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java
index 3446734338..6df9e535bf 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Actor.java
@@ -10,9 +10,11 @@ import java.util.List;
 import javax.annotation.Generated;
 
 import org.jooq.Field;
+import org.jooq.ForeignKey;
 import org.jooq.Identity;
 import org.jooq.Index;
 import org.jooq.Name;
+import org.jooq.Record;
 import org.jooq.Schema;
 import org.jooq.Table;
 import org.jooq.TableField;
@@ -38,7 +40,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Actor extends TableImpl<ActorRecord> {
 
-    private static final long serialVersionUID = 750251167;
+    private static final long serialVersionUID = -1063584915;
 
     /**
      * The reference instance of <code>PUBLIC.ACTOR</code>
@@ -97,6 +99,10 @@ public class Actor extends TableImpl<ActorRecord> {
         super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
+    <O extends Record> Actor(Table<O> child, ForeignKey<O, ActorRecord> key) {
+        super(child, key, ACTOR);
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java
index dbeac0d389..b2eacc5793 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Film.java
@@ -15,6 +15,7 @@ import org.jooq.ForeignKey;
 import org.jooq.Identity;
 import org.jooq.Index;
 import org.jooq.Name;
+import org.jooq.Record;
 import org.jooq.Schema;
 import org.jooq.Table;
 import org.jooq.TableField;
@@ -40,7 +41,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Film extends TableImpl<FilmRecord> {
 
-    private static final long serialVersionUID = -1484720109;
+    private static final long serialVersionUID = 1814763098;
 
     /**
      * The reference instance of <code>PUBLIC.FILM</code>
@@ -114,6 +115,10 @@ public class Film extends TableImpl<FilmRecord> {
         super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
+    <O extends Record> Film(Table<O> child, ForeignKey<O, FilmRecord> key) {
+        super(child, key, FILM);
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -162,6 +167,14 @@ public class Film extends TableImpl<FilmRecord> {
         return Arrays.<ForeignKey<FilmRecord, ?>>asList(Keys.FKD2YJC1RU34H1SMWLA3FX7B6NX, Keys.FKN2UB730RPO5B5E9X6U2LWL9FT);
     }
 
+    public Language fkd2yjc1ru34h1smwla3fx7b6nx() {
+        return new Language(this, Keys.FKD2YJC1RU34H1SMWLA3FX7B6NX);
+    }
+
+    public Language fkn2ub730rpo5b5e9x6u2lwl9ft() {
+        return new Language(this, Keys.FKN2UB730RPO5B5E9X6U2LWL9FT);
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java
index 6a5ae45f33..73d3e1eab8 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/FilmActor.java
@@ -38,7 +38,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class FilmActor extends TableImpl<FilmActorRecord> {
 
-    private static final long serialVersionUID = 77050042;
+    private static final long serialVersionUID = -1413935489;
 
     /**
      * The reference instance of <code>PUBLIC.FILM_ACTOR</code>
@@ -132,6 +132,14 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
         return Arrays.<ForeignKey<FilmActorRecord, ?>>asList(Keys.FK3FSUXQ0JJ1XONRE7BHROOPVBX, Keys.FK43SD2F45W7YN0GAXQ94EHTWT2);
     }
 
+    public Film film() {
+        return new Film(this, Keys.FK3FSUXQ0JJ1XONRE7BHROOPVBX);
+    }
+
+    public Actor actor() {
+        return new Actor(this, Keys.FK43SD2F45W7YN0GAXQ94EHTWT2);
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java
index 6a881083ac..3d912a947b 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/tables/Language.java
@@ -10,9 +10,11 @@ import java.util.List;
 import javax.annotation.Generated;
 
 import org.jooq.Field;
+import org.jooq.ForeignKey;
 import org.jooq.Identity;
 import org.jooq.Index;
 import org.jooq.Name;
+import org.jooq.Record;
 import org.jooq.Schema;
 import org.jooq.Table;
 import org.jooq.TableField;
@@ -38,7 +40,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Language extends TableImpl<LanguageRecord> {
 
-    private static final long serialVersionUID = 30719078;
+    private static final long serialVersionUID = -1003312401;
 
     /**
      * The reference instance of <code>PUBLIC.LANGUAGE</code>
@@ -92,6 +94,10 @@ public class Language extends TableImpl<LanguageRecord> {
         super(alias, null, aliased, parameters, DSL.comment(""));
     }
 
+    <O extends Record> Language(Table<O> child, ForeignKey<O, LanguageRecord> key) {
+        super(child, key, LANGUAGE);
+    }
+
     /**
      * {@inheritDoc}
      */