diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index 73257f4a81..ec2b4bd807 100644
--- a/jOOQ-meta/pom.xml
+++ b/jOOQ-meta/pom.xml
@@ -131,6 +131,54 @@
                             </plugins>
                         </configuration>
                     </execution>
+                        
+                    <execution>
+                        <id>vertabelo-xml</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <forceRegenerate>true</forceRegenerate>
+                            <extension>true</extension>
+                            <strict>false</strict>
+                            <schemaDirectory>src/main/resources/xsd</schemaDirectory>
+                            <bindingDirectory>src/main/resources/xjb/vertabelo</bindingDirectory>
+                            <schemaIncludes>
+                                <include>vertabelo-2.1.xsd</include>
+                            </schemaIncludes>
+                            <generatePackage>org.jooq.util.vertabelo.jaxb</generatePackage>
+                            <args>
+                                <arg>-Xxew</arg>
+                                <arg>-Xxew:instantiate lazy</arg>
+                                <arg>-Xxew:delete</arg>
+                                <arg>-Xfluent-api</arg>
+                                <arg>-Xdefault-value</arg>
+                                <arg>-Xannotate</arg>
+                            </args>
+                            <plugins>
+                                <plugin>
+                                    <groupId>com.github.jaxb-xew-plugin</groupId>
+                                    <artifactId>jaxb-xew-plugin</artifactId>
+                                    <version>1.0</version>
+                               </plugin>
+                                <plugin>
+                                    <groupId>org.jvnet.jaxb2_commons</groupId>
+                                    <artifactId>jaxb2-fluent-api</artifactId>
+                                    <version>3.0</version>
+                                </plugin>
+                                <plugin>
+                                    <groupId>org.jvnet.jaxb2_commons</groupId>
+                                    <artifactId>jaxb2-default-value</artifactId>
+                                    <version>1.1</version>
+                                </plugin>
+                                <plugin>
+                                    <groupId>org.jvnet.jaxb2_commons</groupId>
+                                    <artifactId>jaxb2-basics-annotate</artifactId>
+                                    <version>0.6.2</version>
+                                </plugin>
+                            </plugins>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
@@ -165,4 +213,4 @@
             <artifactId>jooq</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/vertabelo/VertabeloXMLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/vertabelo/VertabeloXMLDatabase.java
new file mode 100644
index 0000000000..18fceb76e3
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/vertabelo/VertabeloXMLDatabase.java
@@ -0,0 +1,449 @@
+package org.jooq.util.vertabelo;
+
+import java.io.File;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.bind.JAXB;
+
+import org.jooq.DSLContext;
+import org.jooq.SQLDialect;
+import org.jooq.impl.DSL;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StringUtils;
+import org.jooq.util.AbstractDatabase;
+import org.jooq.util.ArrayDefinition;
+import org.jooq.util.CheckConstraintDefinition;
+import org.jooq.util.ColumnDefinition;
+import org.jooq.util.DataTypeDefinition;
+import org.jooq.util.DefaultCheckConstraintDefinition;
+import org.jooq.util.DefaultDataTypeDefinition;
+import org.jooq.util.DefaultRelations;
+import org.jooq.util.DefaultSequenceDefinition;
+import org.jooq.util.EnumDefinition;
+import org.jooq.util.PackageDefinition;
+import org.jooq.util.RoutineDefinition;
+import org.jooq.util.SchemaDefinition;
+import org.jooq.util.SequenceDefinition;
+import org.jooq.util.TableDefinition;
+import org.jooq.util.UDTDefinition;
+import org.jooq.util.vertabelo.jaxb.AlternateKey;
+import org.jooq.util.vertabelo.jaxb.AlternateKeyColumn;
+import org.jooq.util.vertabelo.jaxb.Column;
+import org.jooq.util.vertabelo.jaxb.DatabaseModel;
+import org.jooq.util.vertabelo.jaxb.Property;
+import org.jooq.util.vertabelo.jaxb.Reference;
+import org.jooq.util.vertabelo.jaxb.ReferenceColumn;
+import org.jooq.util.vertabelo.jaxb.Sequence;
+import org.jooq.util.vertabelo.jaxb.Table;
+import org.jooq.util.vertabelo.jaxb.TableCheck;
+import org.jooq.util.vertabelo.jaxb.View;
+
+/**
+ * The Vertabelo XML Database
+ *
+ * @author Michał Kołodziejski
+ */
+public class VertabeloXMLDatabase extends AbstractDatabase {
+
+    interface TableOperation {
+        void invoke(Table table, String schemaName);
+    }
+
+    interface ViewOperation {
+        void invoke(View view, String schemaName);
+    }
+
+
+    private static final JooqLogger log = JooqLogger.getLogger(VertabeloXMLDatabase.class);
+
+    // codegen properties
+    private static final String XML_FILE_PARAM = "xml-file";
+    private static final String DIALECT_PARAM = "dialect";
+
+    // XML additional properties
+    private static final String SCHEMA_ADDITIONAL_PROPERTY_NAME = "Schema";
+    private static final String PK_ADDITIONAL_PROPERTY_NAME = "Primary key name";
+
+
+    protected DatabaseModel databaseModel;
+
+    protected DatabaseModel databaseModel() {
+        if(databaseModel == null) {
+            databaseModel = JAXB.unmarshal(new File(getProperties().getProperty(XML_FILE_PARAM)), DatabaseModel.class);
+        }
+
+        return databaseModel;
+    }
+
+
+    @Override
+    protected DSLContext create0() {
+        @SuppressWarnings("deprecation")
+        SQLDialect dialect = SQLDialect.SQL99;
+
+        try {
+            dialect = SQLDialect.valueOf(getProperties().getProperty(DIALECT_PARAM));
+        }
+        catch (Exception ignore) {}
+
+        return DSL.using(dialect);
+    }
+
+
+    @Override
+    protected void loadPrimaryKeys(final DefaultRelations relations) throws SQLException {
+
+        filterTablesBySchema(databaseModel().getTables(), new TableOperation() {
+            @Override
+            public void invoke(Table table, String schemaName) {
+
+                SchemaDefinition schema = getSchema(schemaName);
+                TableDefinition tableDefinition = getTable(schema, table.getName());
+
+                if (tableDefinition != null) {
+                    String pkName = getTablePkName(table);
+
+                    // iterate through all columns and find PK columns
+                    for (Column column : table.getColumns()) {
+                        if (column.isPK()) {
+                            relations.addPrimaryKey(pkName, tableDefinition.getColumn(column.getName()));
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+
+    private String getTablePkName(Table table) {
+        Property pkAdditionalProperty = VertabeloXMLDatabase.findAdditionalProperty(PK_ADDITIONAL_PROPERTY_NAME,
+            table.getProperties());
+        String pkName = VertabeloXMLDatabase.getAdditionalPropertyValueOrEmpty(pkAdditionalProperty);
+        if (StringUtils.isEmpty(pkName)) {
+            pkName = table.getName().toUpperCase() + "_PK";
+        }
+        return pkName;
+    }
+
+
+    @Override
+    protected void loadUniqueKeys(final DefaultRelations relations) throws SQLException {
+
+        filterTablesBySchema(databaseModel().getTables(), new TableOperation() {
+            @Override
+            public void invoke(Table table, String schemaName) {
+                SchemaDefinition schema = getSchema(schemaName);
+                TableDefinition tableDefinition = getTable(schema, table.getName());
+
+                if (tableDefinition != null) {
+                    // iterate through all UNIQUE keys for this table
+                    for (AlternateKey alternateKey : table.getAlternateKeys()) {
+
+                        // iterate through all columns of this key
+                        for (AlternateKeyColumn alternateKeyColumn : alternateKey.getColumns()) {
+                            Column column = (Column) alternateKeyColumn.getColumn();
+                            relations.addUniqueKey(alternateKey.getName(), tableDefinition.getColumn(column.getName()));
+                        }
+
+                    }
+                }
+            }
+        });
+
+    }
+
+
+    @Override
+    protected void loadForeignKeys(final DefaultRelations relations) throws SQLException {
+
+        for (final Reference reference : databaseModel().getReferences()) {
+            final Table pkTable = (Table) reference.getPKTable();
+            final Table fkTable = (Table) reference.getFKTable();
+
+            filterTablesBySchema(Arrays.asList(pkTable), new TableOperation() {
+                @Override
+                public void invoke(Table table, String schemaName) {
+                    SchemaDefinition schema = getSchema(schemaName);
+                    TableDefinition pkTableDefinition = getTable(schema, pkTable.getName());
+                    TableDefinition fkTableDefinition = getTable(schema, fkTable.getName());
+
+                    // we need to find unique key among PK and all alternate keys...
+                    String uniqueKeyName = findUniqueConstraintNameForReference(reference);
+                    if(uniqueKeyName == null) {
+                        // no matching key - ignore this foreign key
+                        return;
+                    }
+
+                    for (ReferenceColumn referenceColumn : reference.getReferenceColumns()) {
+                        Column fkColumn = (Column) referenceColumn.getFKColumn();
+                        ColumnDefinition fkColumnDefinition = fkTableDefinition.getColumn(fkColumn.getName());
+
+                        relations.addForeignKey(
+                            reference.getName(),
+                            uniqueKeyName,
+                            fkColumnDefinition,
+                            pkTableDefinition.getSchema());
+                    }
+                }
+            });
+
+        }
+    }
+
+
+    private String findUniqueConstraintNameForReference(Reference reference) {
+        // list of referenced columns
+        List<Column> uniqueKeyColumns = new ArrayList<Column>();
+        for (ReferenceColumn referenceColumn : reference.getReferenceColumns()) {
+            uniqueKeyColumns.add((Column) referenceColumn.getPKColumn());
+        }
+
+
+        // list of PK columns
+        Table pkTable = (Table) reference.getPKTable();
+        List<Column> pkColumns = new ArrayList<Column>();
+        for (Column column : pkTable.getColumns()) {
+            if (column.isPK()) {
+                pkColumns.add(column);
+            }
+        }
+
+        if (uniqueKeyColumns.equals(pkColumns)) {
+            // PK matches FK
+            log.info("Primary key constraint matches foreign key: " + reference.getName());
+            return getTablePkName((Table) reference.getPKTable());
+        }
+
+        // need to check alternate keys
+        for (AlternateKey alternateKey : pkTable.getAlternateKeys()) {
+            List<Column> akColumns = new ArrayList<Column>();
+            for (AlternateKeyColumn column : alternateKey.getColumns()) {
+                akColumns.add((Column) column.getColumn());
+            }
+
+            if (uniqueKeyColumns.equals(akColumns)) {
+                // AK matches FK
+                log.info("Alternate key constraint matches foreign key: " + reference.getName());
+                return alternateKey.getName();
+            }
+        }
+
+        // no match
+        log.info("No matching unique constraint for foreign key: " + reference.getName());
+        return null;
+    }
+
+
+
+    @Override
+    protected void loadCheckConstraints(final DefaultRelations relations) throws SQLException {
+
+        filterTablesBySchema(databaseModel().getTables(), new TableOperation() {
+            @Override
+            public void invoke(Table table, String schemaName) {
+                SchemaDefinition schema = getSchema(schemaName);
+                TableDefinition tableDefinition = getTable(schema, table.getName());
+
+                if (tableDefinition != null) {
+
+                    // iterate through all table checks
+                    for (TableCheck tableCheck : table.getTableChecks()) {
+                        CheckConstraintDefinition checkConstraintDefinition = new DefaultCheckConstraintDefinition(
+                            schema,
+                            tableDefinition,
+                            tableCheck.getName(),
+                            tableCheck.getCheckExpression());
+
+                        relations.addCheckConstraint(tableDefinition, checkConstraintDefinition);
+                    }
+
+                    // iterate through all columns and find columns with checks
+                    for (Column column : table.getColumns()) {
+                        if (! StringUtils.isBlank(column.getCheckExpression())) {
+                            CheckConstraintDefinition checkConstraintDefinition = new DefaultCheckConstraintDefinition(
+                                schema,
+                                tableDefinition,
+                                table.getName() + "_" + column.getName() + "_check",
+                                column.getCheckExpression());
+
+                            relations.addCheckConstraint(tableDefinition, checkConstraintDefinition);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+
+    @Override
+    protected List<SchemaDefinition> getSchemata0() throws SQLException {
+        List<SchemaDefinition> result = new ArrayList<SchemaDefinition>();
+        List<String> schemaNames = new ArrayList<String>();
+
+        // search in tables
+        for (Table table : databaseModel().getTables()) {
+            Property additionalProperty = findAdditionalProperty(SCHEMA_ADDITIONAL_PROPERTY_NAME, table.getProperties());
+            addUniqueSchemaName(additionalProperty, schemaNames);
+        }
+
+        // search in views
+        for (View view : databaseModel().getViews()) {
+            Property additionalProperty = findAdditionalProperty(SCHEMA_ADDITIONAL_PROPERTY_NAME, view.getProperties());
+            addUniqueSchemaName(additionalProperty, schemaNames);
+        }
+
+
+        // transform
+        for (String schemaName : schemaNames) {
+            result.add(new SchemaDefinition(this, schemaName, null));
+        }
+
+        return result;
+    }
+
+
+    private void addUniqueSchemaName(Property additionalProperty, List<String> schemaNames) {
+        String schemaName = ""; // default to empty string
+        if (additionalProperty != null) {
+            // additional property is set
+            schemaName = additionalProperty.getValue();
+        }
+
+        if (!schemaNames.contains(schemaName)) {
+            schemaNames.add(schemaName);
+        }
+    }
+
+
+    @Override
+    protected List<SequenceDefinition> getSequences0() throws SQLException {
+        List<SequenceDefinition> result = new ArrayList<SequenceDefinition>();
+
+        for (Sequence sequence : databaseModel().getSequences()) {
+            Property additionalProperty = VertabeloXMLDatabase.findAdditionalProperty(SCHEMA_ADDITIONAL_PROPERTY_NAME,
+                sequence.getProperties());
+            String schemaName = VertabeloXMLDatabase.getAdditionalPropertyValueOrEmpty(additionalProperty);
+
+            if (getInputSchemata().contains(schemaName)) {
+                SchemaDefinition schema = getSchema(schemaName);
+
+                DataTypeDefinition type = new DefaultDataTypeDefinition(
+                    this,
+                    schema,
+                    "BIGINT"
+                );
+
+                result.add(new DefaultSequenceDefinition(schema, sequence.getName(), type));
+            }
+        }
+
+        return result;
+    }
+
+
+    @Override
+    protected List<TableDefinition> getTables0() throws SQLException {
+        final List<TableDefinition> result = new ArrayList<TableDefinition>();
+
+        // tables
+        filterTablesBySchema(databaseModel().getTables(), new TableOperation() {
+            @Override
+            public void invoke(Table table, String schemaName) {
+                SchemaDefinition schema = getSchema(schemaName);
+                result.add(new VertabeloXMLTableDefinition(schema, table));
+            }
+        });
+
+        // views
+        filterViewsBySchema(databaseModel().getViews(), new ViewOperation() {
+            @Override
+            public void invoke(View view, String schemaName) {
+                SchemaDefinition schema = getSchema(schemaName);
+                result.add(new VertabeloXMLTableDefinition(schema, view));
+            }
+        });
+
+        return result;
+    }
+
+
+    @Override
+    protected List<EnumDefinition> getEnums0() {
+        List<EnumDefinition> result = new ArrayList<EnumDefinition>();
+        return result;
+    }
+
+    @Override
+    protected List<UDTDefinition> getUDTs0() {
+        List<UDTDefinition> result = new ArrayList<UDTDefinition>();
+        return result;
+    }
+
+    @Override
+    protected List<ArrayDefinition> getArrays0() {
+        List<ArrayDefinition> result = new ArrayList<ArrayDefinition>();
+        return result;
+    }
+
+    @Override
+    protected List<RoutineDefinition> getRoutines0() {
+        List<RoutineDefinition> result = new ArrayList<RoutineDefinition>();
+        return result;
+    }
+
+    @Override
+    protected List<PackageDefinition> getPackages0() {
+        List<PackageDefinition> result = new ArrayList<PackageDefinition>();
+        return result;
+    }
+
+
+    protected void filterTablesBySchema(List<Table> tables, TableOperation operation) {
+        for (Table table : tables) {
+            Property schemaAdditionalProperty = VertabeloXMLDatabase.findAdditionalProperty(SCHEMA_ADDITIONAL_PROPERTY_NAME,
+                table.getProperties());
+            String schemaName = VertabeloXMLDatabase.getAdditionalPropertyValueOrEmpty(schemaAdditionalProperty);
+
+            if (getInputSchemata().contains(schemaName)) {
+
+                operation.invoke(table, schemaName);
+
+            }
+        }
+    }
+
+
+    protected void filterViewsBySchema(List<View> views, ViewOperation operation) {
+        for (View view : views) {
+            Property schemaAdditionalProperty = VertabeloXMLDatabase.findAdditionalProperty(SCHEMA_ADDITIONAL_PROPERTY_NAME,
+                view.getProperties());
+            String schemaName = VertabeloXMLDatabase.getAdditionalPropertyValueOrEmpty(schemaAdditionalProperty);
+
+            if (getInputSchemata().contains(schemaName)) {
+
+                operation.invoke(view, schemaName);
+
+            }
+        }
+    }
+
+
+    public static Property findAdditionalProperty(String name, List<Property> properties) {
+        for (Property property : properties) {
+            if (property.getName().equalsIgnoreCase(name)) {
+                return property;
+            }
+        }
+        return null;
+    }
+
+    public static String getAdditionalPropertyValueOrEmpty(Property additionalProperty) {
+        if (additionalProperty != null) {
+            return additionalProperty.getValue();
+        }
+        return "";
+    }
+}
diff --git a/jOOQ-meta/src/main/java/org/jooq/util/vertabelo/VertabeloXMLTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/vertabelo/VertabeloXMLTableDefinition.java
new file mode 100644
index 0000000000..88677b3185
--- /dev/null
+++ b/jOOQ-meta/src/main/java/org/jooq/util/vertabelo/VertabeloXMLTableDefinition.java
@@ -0,0 +1,144 @@
+package org.jooq.util.vertabelo;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jooq.DataType;
+import org.jooq.impl.DefaultDataType;
+import org.jooq.tools.StringUtils;
+import org.jooq.util.AbstractTableDefinition;
+import org.jooq.util.ColumnDefinition;
+import org.jooq.util.DataTypeDefinition;
+import org.jooq.util.DefaultColumnDefinition;
+import org.jooq.util.DefaultDataTypeDefinition;
+import org.jooq.util.SchemaDefinition;
+import org.jooq.util.vertabelo.jaxb.Column;
+import org.jooq.util.vertabelo.jaxb.Property;
+import org.jooq.util.vertabelo.jaxb.Table;
+import org.jooq.util.vertabelo.jaxb.View;
+import org.jooq.util.vertabelo.jaxb.ViewColumn;
+
+/**
+ * Definition of the Vertabelo XML Table
+ *
+ * @author Michał Kołodziejski
+ */
+public class VertabeloXMLTableDefinition extends AbstractTableDefinition {
+
+    protected Table table;
+    protected View view;
+
+    public VertabeloXMLTableDefinition(SchemaDefinition schema, Table table) {
+        super(schema, table.getName(), "");
+
+        this.table = table;
+    }
+
+    public VertabeloXMLTableDefinition(SchemaDefinition schema, View view) {
+        super(schema, view.getName(), "");
+
+        this.view = view;
+    }
+
+
+    @Override
+    protected List<ColumnDefinition> getElements0() throws SQLException {
+        if(table != null) {
+            // table
+            return getTableElements();
+
+        } else {
+            // view
+            return getViewElements();
+        }
+    }
+
+
+    protected List<ColumnDefinition> getTableElements() {
+        List<ColumnDefinition> result = new ArrayList<ColumnDefinition>();
+
+        String schemaName = getSchemaName();
+        SchemaDefinition schema = getDatabase().getSchema(schemaName);
+
+        int position = 0;
+        for(Column column : table.getColumns()) {
+            ++position;
+
+            // convert data type
+            DataType<?> dataType = DefaultDataType.getDataType(getDialect(), column.getType());
+
+            DataTypeDefinition type = new DefaultDataTypeDefinition(
+                getDatabase(),
+                schema,
+                dataType.getTypeName(),
+                dataType.hasLength() ? dataType.length() : null,
+                dataType.hasPrecision() ? dataType.precision() : null,
+                dataType.hasScale() ? dataType.scale() : null,
+                column.isNullable(),
+                !StringUtils.isEmpty(column.getDefaultValue()));
+
+            ColumnDefinition columnDefinition = new DefaultColumnDefinition(
+                this,
+                column.getName(),
+                position,
+                type,
+                false,
+                column.getDescription());
+
+            result.add(columnDefinition);
+        }
+
+        return result;
+    }
+
+
+    protected List<ColumnDefinition> getViewElements() {
+        List<ColumnDefinition> result = new ArrayList<ColumnDefinition>();
+
+        String schemaName = getSchemaName();
+        SchemaDefinition schema = getDatabase().getSchema(schemaName);
+
+        int position = 0;
+        for(ViewColumn column : view.getViewColumns()) {
+            ++position;
+
+            // convert data type
+            DataType<?> dataType = DefaultDataType.getDataType(getDialect(), column.getType());
+
+            DataTypeDefinition type = new DefaultDataTypeDefinition(
+                getDatabase(),
+                schema,
+                dataType.getTypeName(),
+                dataType.hasLength() ? dataType.length() : null,
+                dataType.hasPrecision() ? dataType.precision() : null,
+                dataType.hasScale() ? dataType.scale() : null,
+                true,
+                false);
+
+            ColumnDefinition columnDefinition = new DefaultColumnDefinition(
+                this,
+                column.getName(),
+                position,
+                type,
+                false,
+                column.getDescription());
+
+            result.add(columnDefinition);
+        }
+
+        return result;
+    }
+
+    protected String getSchemaName() {
+        Property additionalProperty;
+
+        if(table != null) {
+            additionalProperty = VertabeloXMLDatabase.findAdditionalProperty("Schema", table.getProperties());
+        } else {
+            additionalProperty = VertabeloXMLDatabase.findAdditionalProperty("Schema", view.getProperties());
+        }
+
+        return VertabeloXMLDatabase.getAdditionalPropertyValueOrEmpty(additionalProperty);
+    }
+}
diff --git a/jOOQ-meta/src/main/resources/xjb/vertabelo/binding.xjb b/jOOQ-meta/src/main/resources/xjb/vertabelo/binding.xjb
new file mode 100644
index 0000000000..03fefad849
--- /dev/null
+++ b/jOOQ-meta/src/main/resources/xjb/vertabelo/binding.xjb
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<jaxb:bindings
+	xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:annox="http://annox.dev.java.net"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
+    version="2.1">
+    
+    <jaxb:globalBindings>
+ 
+        <!-- Force all classes implements Serializable -->
+        <xjc:serializable uid="350" />
+        
+        <!-- [#2401] Trim unnecessary whitespace from configuration -->
+        <xjc:javaType name="java.lang.String" xmlType="xs:string" adapter="org.jooq.util.jaxb.tools.TrimAdapter"/>
+    </jaxb:globalBindings>
+ 
+ 
+    <!-- Annotate the following classes with @SuppressWarnings -->
+    <jaxb:bindings schemaLocation="../../xsd/vertabelo-2.1.xsd" multiple="true" node="//xs:complexType">
+        <annox:annotate>
+        	<annox:annotate annox:class="java.lang.SuppressWarnings" value="all" />
+        </annox:annotate>
+    </jaxb:bindings>
+</jaxb:bindings>
\ No newline at end of file
diff --git a/jOOQ-meta/src/main/resources/xsd/vertabelo-2.1.xsd b/jOOQ-meta/src/main/resources/xsd/vertabelo-2.1.xsd
new file mode 100644
index 0000000000..e38cf7de9d
--- /dev/null
+++ b/jOOQ-meta/src/main/resources/xsd/vertabelo-2.1.xsd
@@ -0,0 +1,439 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <xsd:complexType name="Counter">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Value" type="xsd:integer"/>
+            <xsd:element name="Prefix" type="xsd:string"/> 
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Counters">
+        <xsd:sequence>
+            <xsd:element name="Counter" type="Counter" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Property">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Value" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    
+    <xsd:complexType name="Properties">
+        <xsd:sequence>
+            <xsd:element name="Property" type="Property" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Point">
+        <xsd:sequence>
+            <xsd:element name="X" type="xsd:double"/>
+            <xsd:element name="Y" type="xsd:double"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Column">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Type" type="xsd:string"/>
+            <xsd:element name="Description" type="xsd:string"/>
+            <xsd:element name="Nullable" type="xsd:boolean"/>
+            <xsd:element name="PK" type="xsd:boolean"/>
+            <xsd:element name="DefaultValue" type="xsd:string"/>
+            <xsd:element name="CheckExpression" type="xsd:string"/>        
+            <xsd:element name="Properties" type="Properties"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="Columns">
+        <xsd:sequence>
+            <xsd:element name="Column" type="Column" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="ViewColumn">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Type" type="xsd:string"/>
+            <xsd:element name="Description" type="xsd:string"/>
+            <xsd:element name="Properties" type="Properties"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="ViewColumns">
+        <xsd:sequence>
+            <xsd:element name="ViewColumn" type="ViewColumn" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="AlternateKeyColumn">
+        <xsd:sequence>
+            <xsd:element name="Column" type="xsd:IDREF" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="AlternateKey">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Columns" type="AlternateKeyColumn" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="Properties" type="Properties"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="AlternateKeys">
+        <xsd:sequence>
+            <xsd:element name="AlternateKey" type="AlternateKey" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="IndexColumn">
+        <xsd:sequence>
+            <xsd:element name="Column" type="xsd:IDREF" />
+            <xsd:element name="Ascending" type="xsd:boolean"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Index">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Columns" type="IndexColumn" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="Properties" type="Properties"/>     
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="Indexes">
+        <xsd:sequence>
+            <xsd:element name="Index" type="Index" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="TableCheck">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Description" type="xsd:string"/>
+            <xsd:element name="CheckExpression" type="xsd:string"/>
+            <xsd:element name="Properties" type="Properties"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="TableChecks">
+        <xsd:sequence>
+            <xsd:element name="TableCheck" type="TableCheck" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+  
+    <xsd:complexType name="TableDisplayInfo">
+        <xsd:sequence>
+            <xsd:element name="X" type="xsd:double"/>
+            <xsd:element name="Y" type="xsd:double"/>
+            <xsd:element name="Width" type="xsd:double"/>
+            <xsd:element name="Height" type="xsd:double"/>
+            <xsd:element name="LineColor" type="xsd:string"/>
+            <xsd:element name="FillColor" type="xsd:string"/>
+			<xsd:element name="Table" type="xsd:IDREF" minOccurs="0" maxOccurs="1"/>
+			<xsd:element name="FixedSize" type="xsd:boolean"/>
+        </xsd:sequence>
+		<xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+  
+    <xsd:complexType name="Table">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Description" type="xsd:string"/>
+            <xsd:element name="Columns" type="Columns"/>
+            <xsd:element name="AlternateKeys" type="AlternateKeys"/>    
+            <xsd:element name="Indexes" type="Indexes"/>    
+            <xsd:element name="TableChecks" type="TableChecks"/>            
+            <xsd:element name="AdditionalSQLBefore" type="xsd:string"/>
+            <xsd:element name="AdditionalSQLAfter" type="xsd:string"/>
+            <xsd:element name="Properties" type="Properties"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="Tables">
+        <xsd:sequence>
+            <xsd:element name="Table" type="Table" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+	
+	<xsd:complexType name="TableDisplays">
+		<xsd:sequence>
+            <xsd:element name="TableDisplay" type="TableDisplayInfo" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+	</xsd:complexType>
+    
+    <xsd:complexType name="ViewDisplayInfo">
+        <xsd:sequence>
+            <xsd:element name="X" type="xsd:double"/>
+            <xsd:element name="Y" type="xsd:double"/>
+            <xsd:element name="Width" type="xsd:double"/>
+            <xsd:element name="Height" type="xsd:double"/>
+            <xsd:element name="LineColor" type="xsd:string"/>
+            <xsd:element name="FillColor" type="xsd:string"/>
+			<xsd:element name="FixedSize" type="xsd:boolean"/>
+			<xsd:element name="View" type="xsd:IDREF"/>
+        </xsd:sequence>
+       <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="ViewDependency">
+        <xsd:sequence>
+            <xsd:element name="View" type="xsd:IDREF" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+  
+    <xsd:complexType name="View">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Description" type="xsd:string"/>
+            <xsd:element name="SQLQuery" type="xsd:string"/>
+            <xsd:element name="ViewColumns" type="ViewColumns"/>
+            <xsd:element name="AdditionalSQLBefore" type="xsd:string"/>
+            <xsd:element name="AdditionalSQLAfter" type="xsd:string"/>
+            <xsd:element name="Dependencies" type="ViewDependency" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="Properties" type="Properties"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="Views">
+        <xsd:sequence>
+            <xsd:element name="View" type="View" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+	
+	<xsd:complexType name="ViewDisplays">
+        <xsd:sequence>
+            <xsd:element name="ViewDisplay" type="ViewDisplayInfo" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    
+	<xsd:simpleType name="Cardinality">
+	    <xsd:restriction base="xsd:string">
+	        <xsd:enumeration value="0..*"/>
+	        <xsd:enumeration value="1..*"/>
+	        <xsd:enumeration value="0..1"/>
+	        <xsd:enumeration value="1..1"/>
+	    </xsd:restriction>
+	</xsd:simpleType>
+	
+	<xsd:simpleType name="ConstraintAction">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="None"/>
+            <xsd:enumeration value="Restrict"/>
+            <xsd:enumeration value="Cascade"/>
+            <xsd:enumeration value="SetNull"/>
+            <xsd:enumeration value="SetDefault"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="ControlPointsType">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="Vertical_2CP"/>
+            <xsd:enumeration value="Horizontal_2CP"/>
+            <xsd:enumeration value="Vertical_4CP"/>
+            <xsd:enumeration value="Horizontal_4CP"/>
+            <xsd:enumeration value="Cross_3CP"/>
+            <xsd:enumeration value="Self_4CP"/>
+            <xsd:enumeration value="Self_5CP"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:complexType name="ReferenceColumn">
+        <xsd:sequence>
+            <xsd:element name="PKColumn" type="xsd:IDREF" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="FKColumn" type="xsd:IDREF" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="ReferenceColumns">
+        <xsd:sequence>
+            <xsd:element name="ReferenceColumn" type="ReferenceColumn" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="ReferenceDisplayInfo">
+        <xsd:sequence>
+            <xsd:element name="Color" type="xsd:string"/>
+            <xsd:element name="ControlPointsType" type="ControlPointsType"/>
+            <xsd:element name="ControlPoint" type="Point" minOccurs="2" maxOccurs="unbounded"/>
+			<xsd:element name="PkTableDisplay" type="xsd:IDREF"/>
+			<xsd:element name="FkTableDisplay" type="xsd:IDREF"/>
+			<xsd:element name="Reference" type="xsd:IDREF"/>
+        </xsd:sequence>
+		<xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="Reference">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Description" type="xsd:string"/>            
+            <xsd:element name="PKTable" type="xsd:IDREF"/>
+            <xsd:element name="FKTable" type="xsd:IDREF"/>
+            <xsd:element name="PKRole" type="xsd:string"/>
+            <xsd:element name="FKRole" type="xsd:string"/>
+            <xsd:element name="ReferenceColumns" type="ReferenceColumns"/>
+            <xsd:element name="Cardinality" type="Cardinality"/>
+            <xsd:element name="Mandatory" type="xsd:boolean"/>        
+            <xsd:element name="OnUpdateAction" type="ConstraintAction"/>
+            <xsd:element name="OnDeleteAction" type="ConstraintAction"/>
+            <xsd:element name="Properties" type="Properties"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="References">
+        <xsd:sequence>
+            <xsd:element name="Reference" type="Reference" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+	
+	<xsd:complexType name="ReferenceDisplays">
+        <xsd:sequence>
+            <xsd:element name="ReferenceDisplay" type="ReferenceDisplayInfo" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Sequence">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Description" type="xsd:string"/>            
+            <xsd:element name="StartWith" type="xsd:string"/>            
+            <xsd:element name="IncrementBy" type="xsd:string"/>            
+            <xsd:element name="MinValue" type="xsd:string"/>            
+            <xsd:element name="HasMinValue" type="xsd:boolean"/>            
+            <xsd:element name="MaxValue" type="xsd:string"/>            
+            <xsd:element name="HasMaxValue" type="xsd:boolean"/>            
+            <xsd:element name="Cycle" type="xsd:boolean"/>            
+            <xsd:element name="Cache" type="xsd:string"/>            
+            <xsd:element name="HasCache" type="xsd:boolean"/>            
+            <xsd:element name="AdditionalSQLBefore" type="xsd:string"/>
+            <xsd:element name="AdditionalSQLAfter" type="xsd:string"/>
+            <xsd:element name="Properties" type="Properties"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="Sequences">
+        <xsd:sequence>
+            <xsd:element name="Sequence" type="Sequence" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="NoteDisplayInfo">
+        <xsd:sequence>
+            <xsd:element name="X" type="xsd:double"/>
+            <xsd:element name="Y" type="xsd:double"/>
+            <xsd:element name="Width" type="xsd:double"/>
+            <xsd:element name="Height" type="xsd:double"/>
+            <xsd:element name="LineColor" type="xsd:string"/>
+            <xsd:element name="FillColor" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Note">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Content" type="xsd:string"/>
+            <xsd:element name="DisplayInfo" type="NoteDisplayInfo"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="Notes">
+        <xsd:sequence>
+            <xsd:element name="Note" type="Note" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    
+    <xsd:complexType name="AreaDisplayInfo">
+        <xsd:sequence>
+            <xsd:element name="X" type="xsd:double"/>
+            <xsd:element name="Y" type="xsd:double"/>
+            <xsd:element name="Width" type="xsd:double"/>
+            <xsd:element name="Height" type="xsd:double"/>
+            <xsd:element name="LineColor" type="xsd:string"/>
+            <xsd:element name="FillColor" type="xsd:string"/>
+			<xsd:element name="DashArray" type="xsd:string"/>
+			<xsd:element name="NameX" type="xsd:double"/>
+			<xsd:element name="NameY" type="xsd:double"/>
+			<xsd:element name="NameColor" type="xsd:string"/>
+			<xsd:element name="ZIndex" type="xsd:integer"/>
+        </xsd:sequence>
+    </xsd:complexType>
+	
+    <xsd:complexType name="Area">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="DisplayInfo" type="AreaDisplayInfo"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="Areas">
+        <xsd:sequence>
+            <xsd:element name="Area" type="Area" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    
+    <xsd:complexType name="TextDisplayInfo">
+        <xsd:sequence>
+            <xsd:element name="X" type="xsd:double"/>
+            <xsd:element name="Y" type="xsd:double"/>
+            <xsd:element name="Width" type="xsd:double"/>
+            <xsd:element name="Height" type="xsd:double"/>
+            <xsd:element name="Color" type="xsd:string"/>
+            <xsd:element name="Font" type="xsd:string"/>
+            <xsd:element name="Align" type="xsd:string"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="Text">
+        <xsd:sequence>
+            <xsd:element name="Name" type="xsd:string"/>
+            <xsd:element name="Content" type="xsd:string"/>
+            <xsd:element name="DisplayInfo" type="TextDisplayInfo"/>
+        </xsd:sequence>
+        <xsd:attribute name="Id" type="xsd:ID"/>
+    </xsd:complexType>
+    
+    <xsd:complexType name="Texts">
+        <xsd:sequence>
+            <xsd:element name="Text" type="Text" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    
+    <xsd:element name="DatabaseModel">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:element name="ModelGid" type="xsd:string"/>
+                <xsd:element name="ModelVersionGid" type="xsd:string"/>        
+                <xsd:element name="Counters" type="Counters"/>
+				<xsd:element name="AdditionalSQLBeforeCreate" type="xsd:string"/>
+				<xsd:element name="AdditionalSQLAfterCreate" type="xsd:string"/>
+				<xsd:element name="AdditionalSQLBeforeDrop" type="xsd:string"/>
+				<xsd:element name="AdditionalSQLAfterDrop" type="xsd:string"/>
+                <xsd:element name="Tables" type="Tables"/>
+                <xsd:element name="Views" type="Views"/>
+                <xsd:element name="References" type="References"/>
+                <xsd:element name="Sequences" type="Sequences"/>
+                <xsd:element name="Notes" type="Notes"/>
+                <xsd:element name="Areas" type="Areas"/>
+                <xsd:element name="Texts" type="Texts"/>
+				<xsd:element name="TableDisplays" type="TableDisplays"/>
+				<xsd:element name="ViewDisplays" type="ViewDisplays"/>
+				<xsd:element name="ReferenceDisplays" type="ReferenceDisplays"/>
+				<xsd:element name="Properties" type="Properties" minOccurs="0" maxOccurs="1"/>
+            </xsd:sequence>
+		<xsd:attribute name="VersionId" type="xsd:string"/>
+        </xsd:complexType>
+    </xsd:element>
+</xsd:schema>