diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a197f5d..4b30e28 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -17,6 +17,8 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
+      - name: Move into examples directory
+        run: cd examples
       - name: Make gradlew executable
         run: chmod +x gradlew
       - name: Run tests with Gradle wrapper
diff --git a/build.gradle.kts b/build.gradle.kts
index 15d33fb..e53fb3c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,54 +17,44 @@
 plugins {
     kotlin("jvm")
     id("org.jetbrains.kotlinx.kover")
-    id("org.sonarqube")
 }
 
-dependencies {
-    kover(project(":examples"))
-    kover(project(":library"))
-}
-
-allprojects {
-    apply(plugin = "kotlin")
-    apply(plugin = "org.jetbrains.kotlinx.kover")
-
-    group = "ch.icken"
-    version = "0.1.0-SNAPSHOT"
+group = "ch.icken"
+version = "0.1.0-SNAPSHOT"
 
-    repositories {
-        mavenCentral()
-    }
+repositories {
+    mavenCentral()
 }
 
-configure(subprojects) {
-    dependencies {
-        val quarkusVersion: String by project
-        val mockkVersion: String by project
-
-        implementation(platform("io.quarkus.platform:quarkus-bom:$quarkusVersion"))
-        implementation("io.quarkus:quarkus-hibernate-orm-panache-kotlin")
-        testImplementation("io.quarkus:quarkus-junit5")
-        testImplementation("io.mockk:mockk:$mockkVersion")
-    }
-
-    tasks.test {
-        useJUnitPlatform()
-    }
-
-    kotlin {
-        jvmToolchain(17)
-    }
+dependencies {
+    val quarkusVersion: String by project
+    val kspVersion: String by project
+    val kotlinPoetVersion: String by project
+    val mockkVersion: String by project
+    val compileTestingVersion: String by project
+
+    implementation(platform("io.quarkus.platform:quarkus-bom:$quarkusVersion"))
+    implementation("io.quarkus:quarkus-hibernate-orm-panache-kotlin")
+    implementation("com.google.devtools.ksp:symbol-processing-api:$kspVersion")
+    implementation("com.squareup:kotlinpoet:$kotlinPoetVersion")
+    implementation("com.squareup:kotlinpoet-ksp:$kotlinPoetVersion")
+
+    testImplementation("io.quarkus:quarkus-junit5")
+    testImplementation("io.mockk:mockk:$mockkVersion")
+    testImplementation("com.github.tschuchortdev:kotlin-compile-testing:$compileTestingVersion")
+    testImplementation("com.github.tschuchortdev:kotlin-compile-testing-ksp:$compileTestingVersion")
 }
 
-tasks.test {
-    useJUnitPlatform()
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+kotlin {
+    jvmToolchain(17)
 }
 
-sonar {
-    properties {
-        property("sonar.projectKey", "Thijsiez_panache-kotlin-dsl_760170ef-68c7-43b0-880d-cf1034afe3c6")
-        property("sonar.projectName", "panache-kotlin-dsl")
-        property("sonar.coverage.jacoco.xmlReportPaths", "**/build/reports/kover/report.xml")
+tasks {
+    test {
+        useJUnitPlatform()
     }
 }
diff --git a/examples/.gitignore b/examples/.gitignore
new file mode 100644
index 0000000..e2abf4b
--- /dev/null
+++ b/examples/.gitignore
@@ -0,0 +1,145 @@
+# Created by https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,kotlin
+# Edit at https://www.toptal.com/developers/gitignore?templates=intellij+all,gradle,kotlin
+
+### Intellij+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+.idea/artifacts
+.idea/compiler.xml
+.idea/jarRepositories.xml
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
+*.iml
+*.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Intellij+all Patch ###
+# Ignore everything but code style settings and run configurations
+# that are supposed to be shared within teams.
+
+.idea/*
+
+!.idea/codeStyles
+!.idea/runConfigurations
+
+### Kotlin ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Gradle Patch ###
+# Java heap dump
+*.hprof
+
+# End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,kotlin
\ No newline at end of file
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index ed03acb..c3c9546 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -16,25 +16,77 @@
 
 plugins {
     id("io.quarkus")
+    kotlin("jvm")
     kotlin("plugin.allopen")
     kotlin("plugin.jpa")
     id("com.google.devtools.ksp")
+    id("org.jetbrains.kotlinx.kover")
+    id("org.sonarqube")
+}
+
+group = "ch.icken"
+version = "0.1.0-SNAPSHOT"
+
+repositories {
+    mavenCentral()
 }
 
 dependencies {
-    implementation(project(":library"))
-    ksp(project(":library"))
+    val quarkusVersion: String by project
+
+    implementation(platform("io.quarkus.platform:quarkus-bom:$quarkusVersion"))
     implementation("io.quarkus:quarkus-jdbc-h2")
-    kover(project(":library"))
+    implementation("io.quarkus:quarkus-hibernate-orm-panache-kotlin")
+    implementation(project(":panache-kotlin-dsl"))
+    ksp(project(":panache-kotlin-dsl"))
+
+    testImplementation("io.quarkus:quarkus-junit5")
+    kover(project(":panache-kotlin-dsl"))
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+kotlin {
+    jvmToolchain(17)
+}
 allOpen {
     annotation("jakarta.persistence.Entity")
 }
-
 ksp {
     arg("addGeneratedAnnotation", "true")
 }
+kover {
+    reports {
+        filters {
+            //Exclude non-library coverage
+            excludes {
+                classes("ch.icken.ExamplesKt")
+                packages("ch.icken.model")
+            }
+        }
+    }
+}
+sonar {
+    properties {
+        property("sonar.projectKey", "Thijsiez_panache-kotlin-dsl_760170ef-68c7-43b0-880d-cf1034afe3c6")
+        property("sonar.projectName", "panache-kotlin-dsl")
+        property("sonar.coverage.jacoco.xmlReportPaths", "**/build/reports/kover/report.xml")
+    }
+}
+
+//Basic Quarkus Gradle setup
+tasks {
+    test {
+        systemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager")
+        useJUnitPlatform()
+    }
+    withType<JavaCompile> {
+        options.compilerArgs.add("-parameters")
+        options.encoding = "UTF-8"
+    }
+}
 
 //Fixes issue with task execution order
 tasks.compileKotlin {
@@ -58,3 +110,8 @@ project.afterEvaluate {
             .filterNot { it.get().name == "processResources" })
     }
 }
+
+//Disable Quarkus native builds triggered by Kover
+tasks.quarkusAppPartsBuild {
+    isEnabled = false
+}
diff --git a/examples/gradle.properties b/examples/gradle.properties
new file mode 100644
index 0000000..c0ea80c
--- /dev/null
+++ b/examples/gradle.properties
@@ -0,0 +1,28 @@
+#
+# Copyright 2023-2024 Thijs Koppen
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#https://github.com/quarkusio/quarkus
+quarkusVersion=3.12.3
+#https://github.com/JetBrains/kotlin
+kotlinVersion=2.0.0
+#https://github.com/google/ksp
+kspVersion=2.0.0-1.0.23
+#https://github.com/Kotlin/kotlinx-kover
+koverVersion=0.8.3
+#https://github.com/SonarSource/sonar-scanner-gradle
+sonarqubeVersion=5.1.0.4882
+
+kotlin.code.style=official
diff --git a/examples/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..249e583
Binary files /dev/null and b/examples/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..323961f
--- /dev/null
+++ b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Oct 07 00:02:53 CEST 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/examples/gradlew b/examples/gradlew
new file mode 100644
index 0000000..1b6c787
--- /dev/null
+++ b/examples/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/examples/gradlew.bat b/examples/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/examples/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/examples/settings.gradle.kts b/examples/settings.gradle.kts
new file mode 100644
index 0000000..6d74fa1
--- /dev/null
+++ b/examples/settings.gradle.kts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023-2024 Thijs Koppen
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+pluginManagement {
+    val quarkusVersion: String by settings
+    val kotlinVersion: String by settings
+    val kspVersion: String by settings
+    val koverVersion: String by settings
+    val sonarqubeVersion: String by settings
+
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    plugins {
+        id("io.quarkus") version quarkusVersion
+        kotlin("jvm") version kotlinVersion
+        kotlin("plugin.allopen") version kotlinVersion
+        kotlin("plugin.jpa") version kotlinVersion
+        id("com.google.devtools.ksp") version kspVersion
+        id("org.jetbrains.kotlinx.kover") version koverVersion
+        id("org.sonarqube") version sonarqubeVersion
+    }
+
+    include(":panache-kotlin-dsl")
+    project(":panache-kotlin-dsl").projectDir = file("..")
+}
+
+rootProject.name = "examples"
diff --git a/examples/src/main/kotlin/ch/icken/model/Assignment.kt b/examples/src/main/kotlin/ch/icken/model/Assignment.kt
index dc04a87..a0aeaad 100644
--- a/examples/src/main/kotlin/ch/icken/model/Assignment.kt
+++ b/examples/src/main/kotlin/ch/icken/model/Assignment.kt
@@ -22,7 +22,7 @@ import jakarta.persistence.*
 
 @Entity
 @Table(name = "ASSIGNMENT")
-class Assignment(
+data class Assignment(
 
     @OneToOne(optional = false)
     @JoinColumn(name = "EMPLOYEE_ID", unique = true, nullable = false)
@@ -33,12 +33,12 @@ class Assignment(
     val client: Client,
 
     @Column(name = "ROLE", nullable = false)
-    var role: String
-
-) : PanacheEntity() {
+    var role: String,
 
     @Column(name = "DESCRIPTION")
     var description: String? = null
 
+) : PanacheEntity() {
+
     companion object : PanacheCompanion<Assignment>
 }
diff --git a/examples/src/main/kotlin/ch/icken/model/Client.kt b/examples/src/main/kotlin/ch/icken/model/Client.kt
index 7698b04..211064a 100644
--- a/examples/src/main/kotlin/ch/icken/model/Client.kt
+++ b/examples/src/main/kotlin/ch/icken/model/Client.kt
@@ -22,16 +22,16 @@ import jakarta.persistence.*
 
 @Entity
 @Table(name = "CLIENT")
-class Client(
+data class Client(
 
     @Column(name = "NAME", unique = true, nullable = false)
-    var name: String
-
-) : PanacheEntity() {
+    var name: String,
 
     @OneToMany(cascade = [CascadeType.ALL], mappedBy = "client", orphanRemoval = true)
     val assignments: MutableSet<Assignment> = HashSet()
 
+) : PanacheEntity() {
+
     operator fun plusAssign(assignment: Assignment) {
         assignments.add(assignment)
     }
diff --git a/examples/src/main/kotlin/ch/icken/model/Department.kt b/examples/src/main/kotlin/ch/icken/model/Department.kt
index 78b5dc4..294f01c 100644
--- a/examples/src/main/kotlin/ch/icken/model/Department.kt
+++ b/examples/src/main/kotlin/ch/icken/model/Department.kt
@@ -22,16 +22,16 @@ import jakarta.persistence.*
 
 @Entity
 @Table(name = "DEPARTMENT")
-class Department(
+data class Department(
 
     @Column(name = "NAME", unique = true,  nullable = false)
-    var name: String
-
-) : PanacheEntity() {
+    var name: String,
 
     @OneToMany(cascade = [CascadeType.ALL], mappedBy = "department", orphanRemoval = true)
     val employees: MutableSet<Employee> = HashSet()
 
+) : PanacheEntity() {
+
     operator fun plusAssign(employee: Employee) {
         employees.add(employee)
     }
diff --git a/examples/src/main/kotlin/ch/icken/model/Employee.kt b/examples/src/main/kotlin/ch/icken/model/Employee.kt
index f1d327b..eda3b24 100644
--- a/examples/src/main/kotlin/ch/icken/model/Employee.kt
+++ b/examples/src/main/kotlin/ch/icken/model/Employee.kt
@@ -23,7 +23,7 @@ import java.time.LocalDate
 
 @Entity
 @Table(name = "EMPLOYEE")
-class Employee(
+data class Employee(
 
     @Column(name = "EMPLOYEE_NO", unique = true, nullable = false, updatable = false)
     val employeeNumber: Int,
@@ -46,13 +46,13 @@ class Employee(
     var department: Department,
 
     @Column(name = "SALARY", nullable = false)
-    var salary: Double
-
-) : PanacheEntity() {
+    var salary: Double,
 
     @OneToOne(cascade = [CascadeType.ALL], mappedBy = "employee", orphanRemoval = true)
     var assignment: Assignment? = null
 
+) : PanacheEntity() {
+
     companion object : PanacheCompanion<Employee>
 
     enum class Gender {
diff --git a/gradle.properties b/gradle.properties
index 8fb9259..a44eb78 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,5 @@ mockkVersion=1.13.12
 compileTestingVersion=1.6.0
 #https://github.com/Kotlin/kotlinx-kover
 koverVersion=0.8.3
-#https://github.com/SonarSource/sonar-scanner-gradle
-sonarqubeVersion=5.1.0.4882
 
 kotlin.code.style=official
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135..249e583 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..10641c5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
+#Sun Oct 06 23:39:31 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1aa94a4..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,11 +80,13 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -131,29 +133,22 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,15 +193,11 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -214,12 +205,6 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
deleted file mode 100644
index 9d38cba..0000000
--- a/library/build.gradle.kts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2023 Thijs Koppen
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-dependencies {
-    val kspVersion: String by project
-    val kotlinPoetVersion: String by project
-    val compileTestingVersion: String by project
-
-    implementation("com.google.devtools.ksp:symbol-processing-api:$kspVersion")
-    implementation("com.squareup:kotlinpoet:$kotlinPoetVersion")
-    implementation("com.squareup:kotlinpoet-ksp:$kotlinPoetVersion")
-    testImplementation("com.github.tschuchortdev:kotlin-compile-testing:$compileTestingVersion")
-    testImplementation("com.github.tschuchortdev:kotlin-compile-testing-ksp:$compileTestingVersion")
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 09961b0..48be3ca 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,11 +15,8 @@
  */
 
 pluginManagement {
-    val quarkusVersion: String by settings
     val kotlinVersion: String by settings
-    val kspVersion: String by settings
     val koverVersion: String by settings
-    val sonarqubeVersion: String by settings
 
     repositories {
         mavenCentral()
@@ -27,15 +24,9 @@ pluginManagement {
     }
 
     plugins {
-        id("io.quarkus") version quarkusVersion
         kotlin("jvm") version kotlinVersion
-        kotlin("plugin.allopen") version kotlinVersion
-        kotlin("plugin.jpa") version kotlinVersion
-        id("com.google.devtools.ksp") version kspVersion
         id("org.jetbrains.kotlinx.kover") version koverVersion
-        id("org.sonarqube") version sonarqubeVersion
     }
 }
 
 rootProject.name = "panache-kotlin-dsl"
-include(":library", ":examples")
diff --git a/library/src/main/kotlin/ch/icken/processor/ClassNames.kt b/src/main/kotlin/ch/icken/processor/ClassNames.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/processor/ClassNames.kt
rename to src/main/kotlin/ch/icken/processor/ClassNames.kt
diff --git a/library/src/main/kotlin/ch/icken/processor/Extensions.kt b/src/main/kotlin/ch/icken/processor/Extensions.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/processor/Extensions.kt
rename to src/main/kotlin/ch/icken/processor/Extensions.kt
diff --git a/library/src/main/kotlin/ch/icken/processor/Generated.kt b/src/main/kotlin/ch/icken/processor/Generated.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/processor/Generated.kt
rename to src/main/kotlin/ch/icken/processor/Generated.kt
diff --git a/library/src/main/kotlin/ch/icken/processor/GenerationOptions.kt b/src/main/kotlin/ch/icken/processor/GenerationOptions.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/processor/GenerationOptions.kt
rename to src/main/kotlin/ch/icken/processor/GenerationOptions.kt
diff --git a/library/src/main/kotlin/ch/icken/processor/GenerationValues.kt b/src/main/kotlin/ch/icken/processor/GenerationValues.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/processor/GenerationValues.kt
rename to src/main/kotlin/ch/icken/processor/GenerationValues.kt
diff --git a/library/src/main/kotlin/ch/icken/processor/PanacheCompanionBaseProcessor.kt b/src/main/kotlin/ch/icken/processor/PanacheCompanionBaseProcessor.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/processor/PanacheCompanionBaseProcessor.kt
rename to src/main/kotlin/ch/icken/processor/PanacheCompanionBaseProcessor.kt
diff --git a/library/src/main/kotlin/ch/icken/processor/PanacheEntityBaseProcessor.kt b/src/main/kotlin/ch/icken/processor/PanacheEntityBaseProcessor.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/processor/PanacheEntityBaseProcessor.kt
rename to src/main/kotlin/ch/icken/processor/PanacheEntityBaseProcessor.kt
diff --git a/library/src/main/kotlin/ch/icken/processor/QualifiedNames.kt b/src/main/kotlin/ch/icken/processor/QualifiedNames.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/processor/QualifiedNames.kt
rename to src/main/kotlin/ch/icken/processor/QualifiedNames.kt
diff --git a/library/src/main/kotlin/ch/icken/query/BooleanExpression.kt b/src/main/kotlin/ch/icken/query/BooleanExpression.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/query/BooleanExpression.kt
rename to src/main/kotlin/ch/icken/query/BooleanExpression.kt
diff --git a/library/src/main/kotlin/ch/icken/query/Column.kt b/src/main/kotlin/ch/icken/query/Column.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/query/Column.kt
rename to src/main/kotlin/ch/icken/query/Column.kt
diff --git a/library/src/main/kotlin/ch/icken/query/GroupQueryComponent.kt b/src/main/kotlin/ch/icken/query/GroupQueryComponent.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/query/GroupQueryComponent.kt
rename to src/main/kotlin/ch/icken/query/GroupQueryComponent.kt
diff --git a/library/src/main/kotlin/ch/icken/query/InitialQueryComponent.kt b/src/main/kotlin/ch/icken/query/InitialQueryComponent.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/query/InitialQueryComponent.kt
rename to src/main/kotlin/ch/icken/query/InitialQueryComponent.kt
diff --git a/library/src/main/kotlin/ch/icken/query/LogicalQueryComponent.kt b/src/main/kotlin/ch/icken/query/LogicalQueryComponent.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/query/LogicalQueryComponent.kt
rename to src/main/kotlin/ch/icken/query/LogicalQueryComponent.kt
diff --git a/library/src/main/kotlin/ch/icken/query/PanacheSingleResult.kt b/src/main/kotlin/ch/icken/query/PanacheSingleResult.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/query/PanacheSingleResult.kt
rename to src/main/kotlin/ch/icken/query/PanacheSingleResult.kt
diff --git a/library/src/main/kotlin/ch/icken/query/QueryComponent.kt b/src/main/kotlin/ch/icken/query/QueryComponent.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/query/QueryComponent.kt
rename to src/main/kotlin/ch/icken/query/QueryComponent.kt
diff --git a/library/src/main/kotlin/ch/icken/query/WhereQueryComponent.kt b/src/main/kotlin/ch/icken/query/WhereQueryComponent.kt
similarity index 100%
rename from library/src/main/kotlin/ch/icken/query/WhereQueryComponent.kt
rename to src/main/kotlin/ch/icken/query/WhereQueryComponent.kt
diff --git a/library/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
similarity index 100%
rename from library/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
rename to src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
diff --git a/library/src/test/kotlin/ch/icken/processor/PanacheCompanionBaseTests.kt b/src/test/kotlin/ch/icken/processor/PanacheCompanionBaseTests.kt
similarity index 100%
rename from library/src/test/kotlin/ch/icken/processor/PanacheCompanionBaseTests.kt
rename to src/test/kotlin/ch/icken/processor/PanacheCompanionBaseTests.kt
diff --git a/library/src/test/kotlin/ch/icken/processor/PanacheEntityBaseTests.kt b/src/test/kotlin/ch/icken/processor/PanacheEntityBaseTests.kt
similarity index 100%
rename from library/src/test/kotlin/ch/icken/processor/PanacheEntityBaseTests.kt
rename to src/test/kotlin/ch/icken/processor/PanacheEntityBaseTests.kt
diff --git a/library/src/test/kotlin/ch/icken/processor/TestCommon.kt b/src/test/kotlin/ch/icken/processor/TestCommon.kt
similarity index 100%
rename from library/src/test/kotlin/ch/icken/processor/TestCommon.kt
rename to src/test/kotlin/ch/icken/processor/TestCommon.kt