diff --git a/pom.xml b/pom.xml
index cdb1d1f..9eeda2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
         <kotlin.code.style>official</kotlin.code.style>
         <java.version>17</java.version>
         <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <kotlin.version>2.1.20</kotlin.version>
         <serialization.version>1.8.0</serialization.version>
         <scala.version>3.5.2</scala.version>
@@ -49,6 +50,7 @@
         <jackson.version>2.18.2</jackson.version>
         <sqlite.version>3.46.1.2</sqlite.version>
         <postgresql.version>42.7.5</postgresql.version>
+        <buildHelperPlugin.version>3.6.0</buildHelperPlugin.version>
         <sourcePlugin.version>3.3.1</sourcePlugin.version>
         <javaDocPlugin.version>3.11.2</javaDocPlugin.version>
     </properties>
diff --git a/src/core/pom.xml b/src/core/pom.xml
index d54de26..e364db0 100644
--- a/src/core/pom.xml
+++ b/src/core/pom.xml
@@ -17,12 +17,6 @@
     <description>Expose a document store interface for PostgreSQL and SQLite (Core Library)</description>
     <url>https://bitbadger.solutions/open-source/relational-documents/jvm/</url>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kotlin.code.style>official</kotlin.code.style>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -83,6 +77,24 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${buildHelperPlugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/kotlin</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -96,7 +108,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
+            <!-- <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>${javaDocPlugin.version}</version>
@@ -106,12 +118,9 @@
                         <goals>
                             <goal>jar</goal>
                         </goals>
-                        <configuration>
-                            <sourcepath>${project.basedir}/src/main/kotlin</sourcepath>
-                        </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin> -->
         </plugins>
     </build>
 
diff --git a/src/groovy/pom.xml b/src/groovy/pom.xml
index 41e5ece..0289ee4 100644
--- a/src/groovy/pom.xml
+++ b/src/groovy/pom.xml
@@ -72,6 +72,37 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${buildHelperPlugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/groovy</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${sourcePlugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/kotlinx/pom.xml b/src/kotlinx/pom.xml
index 10eb8a8..f2974dc 100644
--- a/src/kotlinx/pom.xml
+++ b/src/kotlinx/pom.xml
@@ -108,6 +108,37 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${buildHelperPlugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/kotlin</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${sourcePlugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/scala/pom.xml b/src/scala/pom.xml
index 7ed1b27..8dc88a8 100644
--- a/src/scala/pom.xml
+++ b/src/scala/pom.xml
@@ -63,6 +63,37 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
+            <!-- <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${buildHelperPlugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/kotlin</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin> -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${sourcePlugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>