diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
index 70f003e888..603fb0712d 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -55,7 +55,12 @@ import java.sql.DriverManager;
 import java.util.List;
 import java.util.Properties;
 
-import javax.xml.bind.JAXB;
+import javax.xml.XMLConstants;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.ValidationEvent;
+import javax.xml.bind.ValidationEventHandler;
+import javax.xml.validation.SchemaFactory;
 
 import org.jooq.tools.JooqLogger;
 import org.jooq.tools.StringUtils;
@@ -359,7 +364,7 @@ public class GenerationTool {
 
     private static void errorIfNull(Object o, String message) {
         if (o == null) {
-            log.error(message + " For details, see http://www.jooq.org/xsd/jooq-codegen-3.2.0.xsd");
+            log.error(message + " For details, see http://www.jooq.org/xsd/jooq-codegen-3.3.0.xsd");
             System.exit(-1);
         }
     }
@@ -402,16 +407,37 @@ public class GenerationTool {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         copyLarge(in, out);
         String xml = out.toString();
+        String xsd = "/xsd/jooq-codegen-3.3.0.xsd";
 
         // TODO [#1201] Add better error handling here
         xml = xml.replaceAll(
             "<(\\w+:)?configuration xmlns(:\\w+)?=\"http://www.jooq.org/xsd/jooq-codegen-\\d+\\.\\d+\\.\\d+.xsd\">",
-            "<$1configuration xmlns$2=\"http://www.jooq.org/xsd/jooq-codegen-3.2.0.xsd\">");
+            "<$1configuration xmlns$2=\"http://www.jooq.org" + xsd + "\">");
 
         xml = xml.replace(
             "<configuration>",
-            "<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-3.2.0.xsd\">");
+            "<configuration xmlns=\"http://www.jooq.org" + xsd + "\">");
 
-        return JAXB.unmarshal(new StringReader(xml), Configuration.class);
+        try {
+            SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            javax.xml.validation.Schema schema = sf.newSchema(
+                GenerationTool.class.getResource(xsd)
+            );
+
+            JAXBContext ctx = JAXBContext.newInstance(Configuration.class);
+            Unmarshaller unmarshaller = ctx.createUnmarshaller();
+            unmarshaller.setSchema(schema);
+            unmarshaller.setEventHandler(new ValidationEventHandler() {
+                @Override
+                public boolean handleEvent(ValidationEvent event) {
+                    log.warn("Unmarshal warning", event.getMessage());
+                    return true;
+                }
+            });
+            return (Configuration) unmarshaller.unmarshal(new StringReader(xml));
+        }
+        catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 }
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index 7c47d388ef..d8a8cbbd45 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -171,7 +171,10 @@ public class JavaGenerator extends AbstractGenerator {
 
         if (generateImmutablePojos && generateInterfaces)
             log.info("  immutable pojos", "Immutable POJOs do not have any setters. Hence, setters are also missing from interfaces");
+        else
+            log.info("  none");
 
+        log.info("");
         log.info("----------------------------------------------------------");
 
         String targetPackage = getTargetPackage();
diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index 5fd6abce89..9c0d38679f 100644
--- a/jOOQ-meta/pom.xml
+++ b/jOOQ-meta/pom.xml
@@ -48,7 +48,7 @@
                             <schemaDirectory>src/main/resources/xsd</schemaDirectory>
                             <bindingDirectory>src/main/resources/xjb</bindingDirectory>
                             <schemaIncludes>
-                                <include>jooq-codegen-3.2.0.xsd</include>
+                                <include>jooq-codegen-3.3.0.xsd</include>
                             </schemaIncludes>
                             <generatePackage>org.jooq.util.jaxb</generatePackage>
                             <args>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
index 129dcd3e31..8693fb6683 100644
--- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java
@@ -579,11 +579,17 @@ public abstract class AbstractDatabase implements Database {
     @Override
     public final ForcedType getConfiguredForcedType(Definition definition, DataTypeDefinition definedType) {
         for (ForcedType forcedType : getConfiguredForcedTypes()) {
-            String expressions = forcedType.getExpressions();
+            String expression = forcedType.getExpression();
+
+            if (forcedType.getExpressions() != null) {
+                expression = forcedType.getExpressions();
+                log.warn("DEPRECATED", "The <expressions/> element in <forcedType/> is deprecated. Use <expression/> instead");
+            }
+
             String types = forcedType.getTypes();
             boolean match = true;
 
-            if (expressions != null && !definition.getQualifiedName().matches(expressions)) {
+            if (expression != null && !definition.getQualifiedName().matches(expression)) {
                 match = false;
             }
 
diff --git a/jOOQ-meta/src/main/resources/xjb/binding.xjb b/jOOQ-meta/src/main/resources/xjb/binding.xjb
index 7a0d43877f..5c81bd0390 100644
--- a/jOOQ-meta/src/main/resources/xjb/binding.xjb
+++ b/jOOQ-meta/src/main/resources/xjb/binding.xjb
@@ -11,7 +11,7 @@
     <jaxb:globalBindings>
  
         <!-- Force all classes implements Serializable -->
-        <xjc:serializable uid="320" />
+        <xjc:serializable uid="330" />
         
         <!-- [#2401] Trim unnecessary whitespace from configuration -->
         <xjc:javaType name="java.lang.String" xmlType="xs:string" adapter="org.jooq.util.jaxb.tools.TrimAdapter"/>
@@ -19,7 +19,7 @@
  
  
     <!-- Annotate the following classes with @SuppressWarnings -->
-    <jaxb:bindings schemaLocation="../xsd/jooq-codegen-3.2.0.xsd" multiple="true" node="//xs:complexType">
+    <jaxb:bindings schemaLocation="../xsd/jooq-codegen-3.3.0.xsd" multiple="true" node="//xs:complexType">
         <annox:annotate>
         	<annox:annotate annox:class="java.lang.SuppressWarnings" value="all" />
         </annox:annotate>
diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.3.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.3.0.xsd
new file mode 100644
index 0000000000..a981979135
--- /dev/null
+++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.3.0.xsd
@@ -0,0 +1,590 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+  xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-3.3.0.xsd"
+  targetNamespace="http://www.jooq.org/xsd/jooq-codegen-3.3.0.xsd"
+  elementFormDefault="qualified">
+
+  <element name="configuration">
+    <complexType>
+      <all>
+        
+        <!--
+          The JDBC configuration element contains information about how
+          to set up the database connection used for source code generation
+          -->
+        <element name="jdbc" type="tns:Jdbc" minOccurs="1"
+          maxOccurs="1" />
+
+        <!--
+          The GENERATOR configuration element contains information about
+          source code generation itself
+          -->
+        <element name="generator" type="tns:Generator" minOccurs="1"
+          maxOccurs="1" />
+      </all>
+    </complexType>
+  </element>
+
+  <complexType name="Jdbc">
+    <all>
+      <!-- The JDBC driver -->
+      <element name="driver" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- The JDBC connection URL -->
+      <element name="url" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- Deprecated. Use database schema configuration elements instead -->
+      <element name="schema" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        The JDBC connection user. Be sure this user has all required
+        GRANTs to the dictionary views/tables to generate the desired artefacts
+        -->
+      <element name="user" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!-- The JDBC connection password -->
+      <element name="password" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Enlist custom JDBC driver properties that are provided to the
+        java.sql.DriverManager when fetching a connection
+        -->
+      <element name="properties" type="tns:Properties" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="Properties">
+    <sequence>
+      <element name="property" type="tns:Property" minOccurs="0" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="Property">
+    <all>
+      <element name="key" type="string" minOccurs="1" maxOccurs="1"/>
+      <element name="value" type="string" minOccurs="1" maxOccurs="1"/>
+    </all>
+  </complexType>
+
+  <complexType name="Generator">
+    <all>
+      <!--
+       The class used to generate source code. You may override this with
+       your custom source code generator
+       -->
+      <element name="name" type="string" default="org.jooq.util.DefaultGenerator"
+        minOccurs="0" maxOccurs="1" />
+
+      <!-- The naming strategy used for class and field names -->
+      <element name="strategy" type="tns:Strategy" minOccurs="0" maxOccurs="1" />
+
+      <!-- The jooq-meta configuration -->
+      <element name="database" type="tns:Database" minOccurs="1" maxOccurs="1" />
+
+      <!-- The jooq-codegen configuration -->
+      <element name="generate" type="tns:Generate" minOccurs="0" maxOccurs="1" />
+
+      <!-- Some information about generation output -->
+      <element name="target" type="tns:Target" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="Strategy">
+    <choice>
+      <!--
+        The class used to provide a naming strategy for generated source
+        code. You may override this with your custom naming strategy
+        -->
+      <element name="name" type="string" minOccurs="0" maxOccurs="1"
+        default="org.jooq.util.DefaultGeneratorStrategy" />
+      
+      <!--
+        The matcher strategy configuration used when applying an
+        XML-based strategy
+        -->
+      <element name="matchers" type="tns:Matchers" minOccurs="0" maxOccurs="1"/>
+    </choice>
+  </complexType>
+  
+  <!--
+    Matchers can be used to provide a naming strategy by regular expression configuration. 
+    -->
+  <complexType name="Matchers">
+    <sequence> 
+      
+      <!--
+        Specify 0..n schema matchers in order to provide a naming strategy for objects
+        created from schemas.
+        -->
+      <element name="schemas" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <all>
+
+            <!--
+              This schema matcher applies to all unqualified or qualified schema names
+              matched by this expression. If left empty, this matcher applies to all schemas. 
+              -->
+            <element name="expression" type="string" minOccurs="0" maxOccurs="1"/>
+            
+            <!--
+              These elements influence the naming of a generated org.jooq.Schema object. 
+              -->
+            <element name="schemaClass" type="tns:MatcherRule" minOccurs="0" maxOccurs="1" />
+            <element name="schemaIdentifier" type="tns:MatcherRule" minOccurs="0" maxOccurs="1" />
+            <element name="schemaImplements" type="string" minOccurs="0" maxOccurs="1" />
+          </all>
+        </complexType>
+      </element>
+    
+      <!--
+        Specify 0..n table matchers in order to provide a naming strategy for objects
+        created from database tables.
+        -->
+      <element name="tables" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <all>
+          
+            <!--
+              This table matcher applies to all unqualified or qualified table names
+              matched by this expression. If left empty, this matcher applies to all tables. 
+              -->
+            <element name="expression" type="string" minOccurs="0" maxOccurs="1"/>
+            
+            <!--
+              These elements influence the naming of a generated org.jooq.Table object.
+              -->
+            <element name="tableClass" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="tableIdentifier" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="tableImplements" type="string" minOccurs="0" maxOccurs="1"/>
+
+            <!-- 
+              These elements influence the naming of a generated org.jooq.Record object.
+              -->
+            <element name="recordClass" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="recordImplements" type="string" minOccurs="0" maxOccurs="1"/>
+            
+            <!--
+              These elements influence the naming of a generated interface, implemented by
+              generated org.jooq.Record objects and by generated POJOs.
+              -->
+            <element name="interfaceClass" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="interfaceImplements" type="string" minOccurs="0" maxOccurs="1"/>
+            
+            <!--
+              These elements influence the naming of a generated org.jooq.DAO object. 
+              -->
+            <element name="daoClass" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="daoImplements" type="string" minOccurs="0" maxOccurs="1"/>
+            
+            <!--
+              These elements influence the naming of a generated POJO object. 
+              -->
+            <element name="pojoClass" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="pojoExtends" type="string" minOccurs="0" maxOccurs="1"/>
+            <element name="pojoImplements" type="string" minOccurs="0" maxOccurs="1"/>
+          </all>
+        </complexType>
+      </element>
+      
+      <!--
+        Specify 0..n field matchers in order to provide a naming strategy for objects
+        created from table fields.
+        -->
+      <element name="fields" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <all>
+          
+            <!--
+              This field matcher applies to all unqualified or qualified field names
+              matched by this expression. If left empty, this matcher applies to all fields. 
+              -->
+            <element name="expression" type="string" minOccurs="0" maxOccurs="1"/>
+            
+            <!--
+              These elements influence the naming of a generated org.jooq.Field object.
+              -->
+            <element name="fieldIdentifier" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="fieldMember" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="fieldSetter" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+            <element name="fieldGetter" type="tns:MatcherRule" minOccurs="0" maxOccurs="1"/>
+          </all>
+        </complexType>
+      </element>
+      
+      <!--
+        Specify 0..n routine matchers in order to provide a naming strategy for objects
+        created from routines.
+        -->
+      <element name="routines" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <all>
+
+            <!--
+              This routine matcher applies to all unqualified or qualified routine names
+              matched by this expression. If left empty, this matcher applies to all routines. 
+              -->
+            <element name="expression" type="string" minOccurs="0" maxOccurs="1"/>
+            
+            <!--
+              These elements influence the naming of a generated org.jooq.Routine object. 
+              -->
+            <element name="routineClass" type="tns:MatcherRule" minOccurs="0" maxOccurs="1" />
+            <element name="routineMethod" type="tns:MatcherRule" minOccurs="0" maxOccurs="1" />
+            <element name="routineImplements" type="string" minOccurs="0" maxOccurs="1"/>
+          </all>
+        </complexType>
+      </element>
+      
+      <!--
+        Specify 0..n sequence matchers in order to provide a naming strategy for objects
+        created from sequences.
+        -->
+      <element name="sequences" minOccurs="0" maxOccurs="unbounded">
+        <complexType>
+          <all>
+
+            <!--
+              This sequence matcher applies to all unqualified or qualified sequence names
+              matched by this expression. If left empty, this matcher applies to all sequences. 
+              -->
+            <element name="expression" type="string" minOccurs="0" maxOccurs="1"/>
+            
+            <!--
+              These elements influence the naming of the generated Sequences class. 
+              -->
+            <element name="sequenceIdentifier" type="tns:MatcherRule" minOccurs="0" maxOccurs="1" />
+          </all>
+        </complexType>
+      </element>
+    </sequence>
+  </complexType>
+  
+  <complexType name="MatcherRule">
+    <all>
+      <element name="transform" type="tns:MatcherTransformType" minOccurs="0" maxOccurs="1"/>
+      <element name="expression" type="string" minOccurs="1" maxOccurs="1"/>
+    </all>
+  </complexType>
+  
+  <simpleType name="MatcherTransformType">
+    <restriction base="string">
+      <enumeration value="AS_IS"/>
+      <enumeration value="LOWER"/>
+      <enumeration value="UPPER"/>
+      <enumeration value="CAMEL"/>
+      <enumeration value="PASCAL"/>
+    </restriction>
+  </simpleType>
+  
+  <complexType name="Database">
+    <all>
+      <!--
+        The database dialect from jooq-meta. Available dialects are
+        named org.util.[database].[database]Database. Known values are:
+
+        org.jooq.util.ase.ASEDatabase
+        org.jooq.util.cubrid.CUBRIDDatabase
+        org.jooq.util.db2.DB2Database
+        org.jooq.util.derby.DerbyDatabase
+        org.jooq.util.h2.H2Database
+        org.jooq.util.hsqldb.HSQLDBDatabase
+        org.jooq.util.ingres.IngresDatabase
+        org.jooq.util.mysql.MySQLDatabase
+        org.jooq.util.oracle.OracleDatabase
+        org.jooq.util.postgres.PostgresDatabase
+        org.jooq.util.sqlite.SQLiteDatabaes
+        org.jooq.util.sqlserver.SQLServerDatabase
+        org.jooq.util.sybase.SybaseDatabase
+
+        You can also provide your own org.jooq.util.Database implementation
+        here, if your database is currently not supported
+        -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!--
+        All elements that are generated from your schema (A Java regular expression. 
+        Use the pipe to separate several expressions) Watch out for
+        case-sensitivity. Depending on your database, this might be
+        important! You can create case-insensitive regular expressions
+        using this syntax: (?i:expr)A comma-separated list of regular
+        expressions
+        -->
+      <element name="includes" type="string" default=".*" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        All elements that are excluded from your schema (A Java regular expression. 
+        Use the pipe to separate several expressions). Excludes match before
+        includes
+        -->
+      <element name="excludes" type="string" default="" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        This flag indicates whether include / exclude patterns should also match
+        columns within tables. 
+        -->
+      <element name="includeExcludeColumns" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        All table and view columns that are used as "version" fields for
+        optimistic locking (A Java regular expression. Use the pipe to separate several expressions).
+        See UpdatableRecord.store() and UpdatableRecord.delete() for details
+        -->
+      <element name="recordVersionFields" type="string" default="" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        All table and view columns that are used as "timestamp" fields for
+        optimistic locking (A Java regular expression. Use the pipe to separate several expressions).
+        See UpdatableRecord.store() and UpdatableRecord.delete() for details
+        -->
+      <element name="recordTimestampFields" type="string" default="" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate java.sql.Timestamp fields for DATE columns. This is
+        particularly useful for Oracle databases
+        -->
+      <element name="dateAsTimestamp" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate jOOU data types for your unsigned data types, which are
+        not natively supported in Java
+        -->
+      <element name="unsignedTypes" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        The schema that is used locally as a source for meta information.
+        This could be your development schema or the production schema, etc
+        This cannot be combined with the schemata element.
+        If left empty (and without any schemata element), jOOQ will generate all available schemata.
+        For backwards compatibility, this defaults to jdbc/schema
+        -->
+      <element name="inputSchema" type="string" default="" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        The schema that is used in generated source code. This will be the
+        production schema. Use this to override your local development
+        schema name for source code generation. If not specified, this
+        will be the same as the input-schema.
+        -->
+      <element name="outputSchema" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        A configuration element to configure several input and/or output
+        schemata for jooq-meta, in case you're using jooq-meta in a multi-
+        schema environment
+        -->
+      <element name="schemata" type="tns:Schemata" minOccurs="0" maxOccurs="1"/>
+
+      <!--
+        A configuration element to configure custom types introduced to jOOQ
+        using converters
+        -->
+      <element name="customTypes" type="tns:CustomTypes" minOccurs="0" maxOccurs="1"/>
+
+      <!--
+        A configuration element to configure synthetic enum types
+        This is EXPERIMENTAL / DEPRECATED functionality. Do not re-use
+        -->
+      <element name="enumTypes" type="tns:EnumTypes" minOccurs="0" maxOccurs="1"/>
+
+      <!--
+        A configuration element to configure type overrides for generated
+        artefacts (e.g. in combination with enumTypes)
+        -->
+      <element name="forcedTypes" type="tns:ForcedTypes" minOccurs="0" maxOccurs="1"/>
+    </all>
+  </complexType>
+
+  <complexType name="Schemata">
+    <sequence>
+      <!--
+        A configuration element for a single schema in multi-schema
+        environments
+        -->
+      <element name="schema" type="tns:Schema" minOccurs="1" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="Schema">
+    <all>
+      <!-- See also database/inputSchema -->
+      <element name="inputSchema" type="string" default="" minOccurs="1" maxOccurs="1" />
+
+      <!-- See also database/outputSchema -->
+      <element name="outputSchema" type="string" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="CustomTypes">
+    <sequence>
+      <!-- A configuration element for a custom type -->
+      <element name="customType" type="tns:CustomType" minOccurs="0" maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+
+  <complexType name="EnumTypes">
+    <sequence>
+      <!-- A configuration element for a synthetic enum type -->
+      <element name="enumType" type="tns:EnumType" minOccurs="0" maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+
+  <complexType name="ForcedTypes">
+    <sequence>
+      <!-- A configuration element for a forced type override -->
+      <element name="forcedType" type="tns:ForcedType" minOccurs="0" maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+
+  <complexType name="CustomType">
+    <all>
+      <!-- The name of the custom type -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- A converter implementation for the custom type -->
+      <element name="converter" type="string" minOccurs="1" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="EnumType">
+    <all>
+      <!-- The name of the synthetic enum type -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- A comma separated (CSV format) list of enum literals -->
+      <element name="literals" type="string" minOccurs="1" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="ForcedType">
+    <all>
+      <!-- The name of the type to be forced upon various artefacts -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!--
+        A Java regular expression matching columns, parameters, attributes, 
+        etc to be forced to have this type. If provided, both "expressions" and 
+        "types" must match.
+        -->
+      <element name="expression" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        The same as expression. This is kept for backwards compatibility reasons.
+        -->
+      <element name="expressions" type="string" minOccurs="0" maxOccurs="1" />
+      
+      <!--
+        A Java regular expression matching data types to be forced to have this
+        type. If provided, both "expressions" and "types" must match.
+        -->
+      <element name="types" type="string" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="Generate">
+    <all>
+      <!--
+        Primary key / foreign key relations should be generated and used.
+        This is a prerequisite for various advanced features
+        -->
+      <element name="relations" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!-- Generate deprecated code for backwards compatibility -->
+      <element name="deprecated" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate instance fields in your tables, as opposed to static
+        fields. This simplifies aliasing
+        -->
+      <element name="instanceFields" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate the javax.annotation.Generated annotation to indicate
+        jOOQ version used for source code
+        -->
+      <element name="generatedAnnotation" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate TableRecord classes. Disable this when you don't
+        need the additional type-safety
+        -->
+      <element name="records" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate POJOs for usage of the ResultQuery.fetchInto(Class) API
+        -->
+      <element name="pojos" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate immutable POJOs for usage of the ResultQuery.fetchInto(Class) API
+        This overrides any value set in <pojos/>
+        -->
+      <element name="immutablePojos" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate interfaces that will be implemented by records and/or pojos.
+        You can also use these interfaces in Record.into(Class<?>) and similar
+        methods, to let jOOQ return proxy objects for them.
+        -->
+      <element name="interfaces" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate DAOs in addition to POJO classes
+        -->
+      <element name="daos" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Annotate POJOs and Records with JPA annotations for increased
+        compatibility and better integration with JPA/Hibernate, etc
+        -->
+      <element name="jpaAnnotations" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Annotate POJOs and Records with JSR-303 validation annotations
+        -->
+      <element name="validationAnnotations" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+      
+      <!-- 
+        Allow to turn off the generation of global object references, which include
+        
+        - Tables.java
+        - Sequences.java
+        - UDTs.java
+        
+        Turning off the generation of the above files may be necessary for very
+        large schemas, which exceed the amount of allowed constants in a class's
+        constant pool (64k) or, whose static initialiser would exceed 64k of
+        byte code
+        -->
+      <element name="globalObjectReferences" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+      
+      <!--
+        Generate fluent setters in
+        
+        - records
+        - pojos
+        - interfaces
+        
+        Fluent setters are against the JavaBeans specification, but can be quite
+        useful to those users who do not depend on EL, JSP, JSF, etc. 
+        -->
+      <element name="fluentSetters" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="Target">
+    <all>
+      <!--
+        The destination package of your generated classes (within the
+        destination directory)
+           
+        jOOQ may append the schema name to this package if generating multiple schemas,
+        e.g. org.jooq.generated.schema1
+             org.jooq.generated.schema2
+        -->
+      <element name="packageName" type="string" default="org.jooq.generated" minOccurs="0" maxOccurs="1" />
+
+      <!-- The destination directory of your generated classes -->
+      <element name="directory" type="string" default="target/generated-sources/jooq" />
+    </all>
+  </complexType>
+</schema>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/IvanD/h2/library.xml b/jOOQ-test/configuration/org/jooq/configuration/IvanD/h2/library.xml
index 6d1de9bd47..1ea260ed18 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/IvanD/h2/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/IvanD/h2/library.xml
@@ -52,54 +52,54 @@
             <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 
                 <!-- [#2477] Check if unsigned types work correctly -->
                 <forcedType>
                     <name>TINYINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
                 </forcedType>
                 <forcedType>
                     <name>SMALLINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>INTEGERUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>BIGINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml
index 60d9efa2f5..108bb43b0f 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/cubrid/library.xml
@@ -50,58 +50,58 @@
             <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
                 
                 <!-- [#2477] Check if unsigned types work correctly -->
                 <forcedType>
                     <name>TINYINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
                 </forcedType>
                 <forcedType>
                     <name>SMALLINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>INTEGERUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>BIGINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml
index 77bcb543fb..d4a2f1afd2 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/derby/library.xml
@@ -52,58 +52,58 @@
             <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
                 
                 <!-- [#2477] Check if unsigned types work correctly -->
                 <forcedType>
                     <name>TINYINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
                 </forcedType>
                 <forcedType>
                     <name>SMALLINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>INTEGERUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>BIGINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml
index 8e5ce2e960..ccf7551dc8 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/firebird/library.xml
@@ -84,83 +84,83 @@
             <forcedTypes>
                 <forcedType>
                 	<name>org.jooq.test._.converters.StringEnum</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_NAME)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_NAME)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>org.jooq.test._.converters.StringEnum1</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_TEXT)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_TEXT)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>org.jooq.test._.converters.OrdinalEnum</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>org.jooq.test._.converters.OrdinalEnum1</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>java.util.Date</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_DATE)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_DATE)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>java.util.GregorianCalendar</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
                 
                 <!-- [#2477] Check if unsigned types work correctly -->
                 <forcedType>
                     <name>TINYINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
                 </forcedType>
                 <forcedType>
                     <name>SMALLINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>INTEGERUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>BIGINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library-matchers.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library-matchers.xml
index 561f2a900b..a5657421ad 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library-matchers.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library-matchers.xml
@@ -154,54 +154,54 @@
       <forcedTypes>
         <forcedType>
           <name>BOOLEAN</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
         </forcedType>
         
         <!-- [#2477] Check if unsigned types work correctly -->
         <forcedType>
           <name>TINYINTUNSIGNED</name>
-          <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+          <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
         </forcedType>
         <forcedType>
           <name>SMALLINTUNSIGNED</name>
-          <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+          <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
         </forcedType>
         <forcedType>
           <name>INTEGERUNSIGNED</name>
-          <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+          <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
         </forcedType>
         <forcedType>
           <name>BIGINTUNSIGNED</name>
-          <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+          <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
         </forcedType>
 
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_10</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
         </forcedType>
       </forcedTypes>
     </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml
index e4b7a93654..f92125e9a2 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/h2/library.xml
@@ -20,6 +20,10 @@
       <inputSchema>PUBLIC</inputSchema>
 
       <customTypes>
+        <!-- [#2844] This typo should emit a warning -->
+        <customtype>
+        </customtype>
+        
         <customType>
           <name>org.jooq.test._.converters.Boolean_10</name>
           <converter>org.jooq.test._.converters.Boolean_10_Converter</converter>
@@ -53,54 +57,54 @@
       <forcedTypes>
         <forcedType>
           <name>BOOLEAN</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
         </forcedType>
         
         <!-- [#2477] Check if unsigned types work correctly -->
         <forcedType>
           <name>TINYINTUNSIGNED</name>
-          <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+          <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
         </forcedType>
         <forcedType>
           <name>SMALLINTUNSIGNED</name>
-          <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+          <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
         </forcedType>
         <forcedType>
           <name>INTEGERUNSIGNED</name>
-          <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+          <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
         </forcedType>
         <forcedType>
           <name>BIGINTUNSIGNED</name>
-          <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+          <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
         </forcedType>
 
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
         </forcedType>
         <forcedType>
           <name>org.jooq.test._.converters.Boolean_10</name>
-          <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+          <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
         </forcedType>
       </forcedTypes>
     </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.xml
index 5e19844747..ea4ec75ab7 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/hsqldb/library.xml
@@ -85,83 +85,83 @@
             <forcedTypes>
                 <forcedType>
                 	<name>org.jooq.test._.converters.StringEnum</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_NAME)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_NAME)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>org.jooq.test._.converters.StringEnum1</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_TEXT)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_TEXT)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>org.jooq.test._.converters.OrdinalEnum</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.DEFAULT_ENUM_ORDINAL)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>org.jooq.test._.converters.OrdinalEnum1</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.CUSTOM_ENUM_NUMERIC)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>java.util.Date</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_DATE)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_DATE)</expression>
                 </forcedType>
                 <forcedType>
                 	<name>java.util.GregorianCalendar</name>
-                	<expressions>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR)</expressions>
+                	<expression>(?i:(.*?\.)?T_MAPPED_TYPES.JAVA_UTIL_CALENDAR)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
                 
                 <!-- [#2477] Check if unsigned types work correctly -->
                 <forcedType>
                     <name>TINYINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
                 </forcedType>
                 <forcedType>
                     <name>SMALLINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>INTEGERUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>BIGINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/jdbc/library-oracle.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/jdbc/library-oracle.xml
index 76a79feb69..321600739c 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/jdbc/library-oracle.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/jdbc/library-oracle.xml
@@ -56,40 +56,40 @@
             <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/jdbc/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/jdbc/library.xml
index c219aef148..532b8a77fc 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/jdbc/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/jdbc/library.xml
@@ -52,58 +52,58 @@
             <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
                 
                 <!-- [#2477] Check if unsigned types work correctly -->
                 <forcedType>
                     <name>TINYINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
                 </forcedType>
                 <forcedType>
                     <name>SMALLINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>INTEGERUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>BIGINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/mariadb/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/mariadb/library.xml
index 69dcc7c9d4..18194e9fdf 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/mariadb/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/mariadb/library.xml
@@ -54,40 +54,40 @@
            <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>java.util.UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.xml
index d0f543881f..2a77be0866 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library-schema-rewrite.xml
@@ -56,40 +56,40 @@
             <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>java.util.UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.xml
index 72b8f29155..0169fac006 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/mysql/library.xml
@@ -54,40 +54,40 @@
            <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>java.util.UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.xml
index 3388ed6fea..f5e59a78a0 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/postgres/library.xml
@@ -49,54 +49,54 @@
             <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 
                 <!-- [#2477] Check if unsigned types work correctly -->
                 <forcedType>
                     <name>TINYINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
                 </forcedType>
                 <forcedType>
                     <name>SMALLINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>INTEGERUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>BIGINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.xml
index 983aa0caf3..176dda491f 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlite/library.xml
@@ -50,58 +50,58 @@
             <forcedTypes>
                 <forcedType>
                     <name>BOOLEAN</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.(VC|C|N)_BOOLEAN)</expression>
                 </forcedType>
                 <forcedType>
                     <name>UUID</name>
-                    <expressions>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expressions>
+                    <expression>(?i:(.*?.)?T_EXOTIC_TYPES.UU)</expression>
                 </forcedType>
                 
                 <!-- [#2477] Check if unsigned types work correctly -->
                 <forcedType>
                     <name>TINYINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_BYTE)</expression>
                 </forcedType>
                 <forcedType>
                     <name>SMALLINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_SHORT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>INTEGERUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_INT)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_INT)</expression>
                 </forcedType>
                 <forcedType>
                     <name>BIGINTUNSIGNED</name>
-                    <expressions>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expressions>
+                    <expression>(?i:(.*?.)?T_UNSIGNED.U_LONG)</expression>
                 </forcedType>
 
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YES_NO_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.YES_NO_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_YN_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.Y_N_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_LC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_LC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_TF_UC</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.TRUE_FALSE_UC)</expression>
                 </forcedType>
                 <forcedType>
                     <name>org.jooq.test._.converters.Boolean_10</name>
-                    <expressions>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expressions>
+                    <expression>(?i:(.*?.)?T_BOOLEANS.ONE_ZERO)</expression>
                 </forcedType>
             </forcedTypes>
         </database>
diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java
index 78e13ba35b..0dd7507392 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Val.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Val.java
@@ -252,6 +252,13 @@ class Val<T> extends AbstractParam<T> {
             toSQLCast(context, dataType, getValueLength(), 0, 0);
         }
 
+        /* [pro] xx
+        xx xxxxxxx xxxx xxxx xxxxx xxxxxx xxx xx xxxx xx xxx xxxxxx xx xxxx xxxxxxxx
+        xxxx xx xxxxx xx xxxxxxxxxxxxxxxxxxxxxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
+            xxxxxxxxxxxxxxxxxx xxxxxxxxx xx xx xxx
+        x
+        xx [/pro] */
+
         // In all other cases, the bind variable can be cast normally
         else {
             toSQLCast(context, dataType, dataType.length(), dataType.precision(), dataType.scale());
diff --git a/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDSL.java b/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDSL.java
index abc69bfb3e..399985612c 100644
--- a/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDSL.java
+++ b/jOOQ/src/main/java/org/jooq/util/mariadb/MariaDBDSL.java
@@ -253,7 +253,7 @@ public class MariaDBDSL extends DSL {
     // -------------------------------------------------------------------------
 
     /**
-     * Get a field based {@link EnumType} by its MariaDB-specific index
+     * Get a field based {@link EnumType} by its MariaDB-specific index.
      * <p>
      * If your MariaDB enum type contains these three values:
      * <code>A, B, C</code> , then this will be the mapping of indexes to