diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java
index c5a45c76fa..3e5992177f 100644
--- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java
+++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/DefaultCatalog.java
@@ -38,7 +38,8 @@ public class DefaultCatalog extends CatalogImpl {
 
     @Override
     public final List<Schema> getSchemas() {
-        return Arrays.<Schema>asList(
-            FlywayTest.FLYWAY_TEST);
+        return Arrays.asList(
+            FlywayTest.FLYWAY_TEST
+        );
     }
 }
diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java
index 392d1a8587..f6018663d2 100644
--- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java
+++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java
@@ -53,14 +53,16 @@ public class FlywayTest extends SchemaImpl {
 
     @Override
     public final List<Sequence<?>> getSequences() {
-        return Arrays.<Sequence<?>>asList(
-            Sequences.S_AUTHOR_ID);
+        return Arrays.asList(
+            Sequences.S_AUTHOR_ID
+        );
     }
 
     @Override
     public final List<Table<?>> getTables() {
-        return Arrays.<Table<?>>asList(
+        return Arrays.asList(
             Author.AUTHOR,
-            Book.BOOK);
+Book.BOOK
+        );
     }
 }
diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/Keys.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/Keys.java
index 1308174b0a..edc2864691 100644
--- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/Keys.java
+++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/Keys.java
@@ -16,7 +16,7 @@ import org.jooq.impl.Internal;
 
 
 /**
- * A class modelling foreign key relationships and constraints of tables in 
+ * A class modelling foreign key relationships and constraints of tables in
  * FLYWAY_TEST.
  */
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java
index c4bf7b8c01..f164b9789e 100644
--- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java
+++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Author.java
@@ -110,7 +110,7 @@ public class Author extends TableImpl<AuthorRecord> {
 
     @Override
     public Schema getSchema() {
-        return FlywayTest.FLYWAY_TEST;
+        return aliased() ? null : FlywayTest.FLYWAY_TEST;
     }
 
     @Override
diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java
index c0218cb261..b5eb39df4b 100644
--- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java
+++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/tables/Book.java
@@ -96,7 +96,7 @@ public class Book extends TableImpl<BookRecord> {
 
     @Override
     public Schema getSchema() {
-        return FlywayTest.FLYWAY_TEST;
+        return aliased() ? null : FlywayTest.FLYWAY_TEST;
     }
 
     @Override
@@ -106,11 +106,16 @@ public class Book extends TableImpl<BookRecord> {
 
     @Override
     public List<ForeignKey<BookRecord, ?>> getReferences() {
-        return Arrays.<ForeignKey<BookRecord, ?>>asList(Keys.FK_T_BOOK_AUTHOR_ID);
+        return Arrays.asList(Keys.FK_T_BOOK_AUTHOR_ID);
     }
 
+    private transient Author _author;
+
     public Author author() {
-        return new Author(this, Keys.FK_T_BOOK_AUTHOR_ID);
+        if (_author == null)
+            _author = new Author(this, Keys.FK_T_BOOK_AUTHOR_ID);
+
+        return _author;
     }
 
     @Override
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java
index 02cf21ec5b..b8162005a5 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultCatalog.java
@@ -38,7 +38,8 @@ public class DefaultCatalog extends CatalogImpl {
 
     @Override
     public final List<Schema> getSchemas() {
-        return Arrays.<Schema>asList(
-            DefaultSchema.DEFAULT_SCHEMA);
+        return Arrays.asList(
+            DefaultSchema.DEFAULT_SCHEMA
+        );
     }
 }
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java
index b740fb3dde..532b8f9ce4 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java
@@ -64,10 +64,11 @@ public class DefaultSchema extends SchemaImpl {
 
     @Override
     public final List<Table<?>> getTables() {
-        return Arrays.<Table<?>>asList(
+        return Arrays.asList(
             Actor.ACTOR,
-            Film.FILM,
-            FilmActor.FILM_ACTOR,
-            Language.LANGUAGE);
+Film.FILM,
+FilmActor.FILM_ACTOR,
+Language.LANGUAGE
+        );
     }
 }
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 5ebe37b57c..5f00ae4762 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
@@ -20,8 +20,8 @@ import org.jooq.impl.Internal;
 
 
 /**
- * A class modelling foreign key relationships and constraints of tables in 
- * the default schema.
+ * A class modelling foreign key relationships and constraints of tables in the
+ * default schema.
  */
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Keys {
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 65deecb222..b6c793d48f 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
@@ -94,7 +94,7 @@ public class Actor extends TableImpl<ActorRecord> {
 
     @Override
     public Schema getSchema() {
-        return DefaultSchema.DEFAULT_SCHEMA;
+        return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA;
     }
 
     @Override
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 a814e491ee..e73e10be06 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
@@ -113,7 +113,7 @@ public class Film extends TableImpl<FilmRecord> {
 
     @Override
     public Schema getSchema() {
-        return DefaultSchema.DEFAULT_SCHEMA;
+        return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA;
     }
 
     @Override
@@ -128,15 +128,24 @@ public class Film extends TableImpl<FilmRecord> {
 
     @Override
     public List<ForeignKey<FilmRecord, ?>> getReferences() {
-        return Arrays.<ForeignKey<FilmRecord, ?>>asList(Keys.FKD2YJC1RU34H1SMWLA3FX7B6NX, Keys.FKN2UB730RPO5B5E9X6U2LWL9FT);
+        return Arrays.asList(Keys.FKD2YJC1RU34H1SMWLA3FX7B6NX, Keys.FKN2UB730RPO5B5E9X6U2LWL9FT);
     }
 
+    private transient Language _fkd2yjc1ru34h1smwla3fx7b6nx;
+    private transient Language _fkn2ub730rpo5b5e9x6u2lwl9ft;
+
     public Language fkd2yjc1ru34h1smwla3fx7b6nx() {
-        return new Language(this, Keys.FKD2YJC1RU34H1SMWLA3FX7B6NX);
+        if (_fkd2yjc1ru34h1smwla3fx7b6nx == null)
+            _fkd2yjc1ru34h1smwla3fx7b6nx = new Language(this, Keys.FKD2YJC1RU34H1SMWLA3FX7B6NX);
+
+        return _fkd2yjc1ru34h1smwla3fx7b6nx;
     }
 
     public Language fkn2ub730rpo5b5e9x6u2lwl9ft() {
-        return new Language(this, Keys.FKN2UB730RPO5B5E9X6U2LWL9FT);
+        if (_fkn2ub730rpo5b5e9x6u2lwl9ft == null)
+            _fkn2ub730rpo5b5e9x6u2lwl9ft = new Language(this, Keys.FKN2UB730RPO5B5E9X6U2LWL9FT);
+
+        return _fkn2ub730rpo5b5e9x6u2lwl9ft;
     }
 
     @Override
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 29c4d09b7a..9fb5d6efdc 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
@@ -91,7 +91,7 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
 
     @Override
     public Schema getSchema() {
-        return DefaultSchema.DEFAULT_SCHEMA;
+        return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA;
     }
 
     @Override
@@ -101,15 +101,24 @@ public class FilmActor extends TableImpl<FilmActorRecord> {
 
     @Override
     public List<ForeignKey<FilmActorRecord, ?>> getReferences() {
-        return Arrays.<ForeignKey<FilmActorRecord, ?>>asList(Keys.FK3FSUXQ0JJ1XONRE7BHROOPVBX, Keys.FK43SD2F45W7YN0GAXQ94EHTWT2);
+        return Arrays.asList(Keys.FK3FSUXQ0JJ1XONRE7BHROOPVBX, Keys.FK43SD2F45W7YN0GAXQ94EHTWT2);
     }
 
+    private transient Film _film;
+    private transient Actor _actor;
+
     public Film film() {
-        return new Film(this, Keys.FK3FSUXQ0JJ1XONRE7BHROOPVBX);
+        if (_film == null)
+            _film = new Film(this, Keys.FK3FSUXQ0JJ1XONRE7BHROOPVBX);
+
+        return _film;
     }
 
     public Actor actor() {
-        return new Actor(this, Keys.FK43SD2F45W7YN0GAXQ94EHTWT2);
+        if (_actor == null)
+            _actor = new Actor(this, Keys.FK43SD2F45W7YN0GAXQ94EHTWT2);
+
+        return _actor;
     }
 
     @Override
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 a0588d69ce..65b89624bb 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
@@ -89,7 +89,7 @@ public class Language extends TableImpl<LanguageRecord> {
 
     @Override
     public Schema getSchema() {
-        return DefaultSchema.DEFAULT_SCHEMA;
+        return aliased() ? null : DefaultSchema.DEFAULT_SCHEMA;
     }
 
     @Override
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/Public.kt b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/Public.kt
index 329f64ee67..0a176124cc 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/Public.kt
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/Public.kt
@@ -52,8 +52,8 @@ open class Public : SchemaImpl("PUBLIC", DefaultCatalog.DEFAULT_CATALOG) {
 
     override fun getTables(): List<Table<*>> = listOf(
         Author.AUTHOR,
-        Book.BOOK,
-        BookStore.BOOK_STORE,
-        BookToBookStore.BOOK_TO_BOOK_STORE
+Book.BOOK,
+BookStore.BOOK_STORE,
+BookToBookStore.BOOK_TO_BOOK_STORE
     )
 }
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/AuthorRecord.kt b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/AuthorRecord.kt
index 8d9d896e79..220e520dea 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/AuthorRecord.kt
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/AuthorRecord.kt
@@ -126,4 +126,16 @@ open class AuthorRecord() : UpdatableRecordImpl<AuthorRecord>(Author.AUTHOR), Re
         this.yearOfBirth = yearOfBirth
         this.address = address
     }
+
+    /**
+     * Create a detached, initialised AuthorRecord
+     */
+    constructor(value: org.jooq.example.kotlin.db.h2.tables.pojos.Author): this() {
+        this.id = value.id
+        this.firstName = value.firstName
+        this.lastName = value.lastName
+        this.dateOfBirth = value.dateOfBirth
+        this.yearOfBirth = value.yearOfBirth
+        this.address = value.address
+    }
 }
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookRecord.kt b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookRecord.kt
index 941fc60e84..63e122944d 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookRecord.kt
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookRecord.kt
@@ -196,4 +196,21 @@ open class BookRecord() : UpdatableRecordImpl<BookRecord>(Book.BOOK), Record11<I
         this.recVersion = recVersion
         this.recTimestamp = recTimestamp
     }
+
+    /**
+     * Create a detached, initialised BookRecord
+     */
+    constructor(value: org.jooq.example.kotlin.db.h2.tables.pojos.Book): this() {
+        this.id = value.id
+        this.authorId = value.authorId
+        this.coAuthorId = value.coAuthorId
+        this.detailsId = value.detailsId
+        this.title = value.title
+        this.publishedIn = value.publishedIn
+        this.languageId = value.languageId
+        this.contentText = value.contentText
+        this.contentPdf = value.contentPdf
+        this.recVersion = value.recVersion
+        this.recTimestamp = value.recTimestamp
+    }
 }
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookStoreRecord.kt b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookStoreRecord.kt
index 25adf4212c..cbef065353 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookStoreRecord.kt
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookStoreRecord.kt
@@ -53,4 +53,11 @@ open class BookStoreRecord() : UpdatableRecordImpl<BookStoreRecord>(BookStore.BO
     constructor(name: String? = null): this() {
         this.name = name
     }
+
+    /**
+     * Create a detached, initialised BookStoreRecord
+     */
+    constructor(value: org.jooq.example.kotlin.db.h2.tables.pojos.BookStore): this() {
+        this.name = value.name
+    }
 }
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookToBookStoreRecord.kt b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookToBookStoreRecord.kt
index 7de6694cf6..339e32efd1 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookToBookStoreRecord.kt
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/tables/records/BookToBookStoreRecord.kt
@@ -82,4 +82,13 @@ open class BookToBookStoreRecord() : UpdatableRecordImpl<BookToBookStoreRecord>(
         this.bookId = bookId
         this.stock = stock
     }
+
+    /**
+     * Create a detached, initialised BookToBookStoreRecord
+     */
+    constructor(value: org.jooq.example.kotlin.db.h2.tables.pojos.BookToBookStore): this() {
+        this.bookStoreName = value.bookStoreName
+        this.bookId = value.bookId
+        this.stock = value.stock
+    }
 }