diff --git a/Forms/ConvertXFAToAcroForms/pom.xml b/Forms/ConvertXFAToAcroForms/pom.xml
index 5b9214f7..0bb3bea2 100644
--- a/Forms/ConvertXFAToAcroForms/pom.xml
+++ b/Forms/ConvertXFAToAcroForms/pom.xml
@@ -21,18 +21,6 @@
         <jni.classifier>win-x86-64-jni</jni.classifier>
       </properties>
     </profile>
-    <profile>
-      <id>MacArm</id>
-      <activation>
-        <os>
-          <family>mac</family>
-          <arch>aarch64</arch>
-        </os>
-      </activation>
-      <properties>
-        <jni.classifier>mac-arm-64-jni</jni.classifier>
-      </properties>
-    </profile>
     <profile>
       <id>Linux64</id>
       <activation>
@@ -79,6 +67,30 @@
       <version>18.36.0</version>
       <classifier>javadoc</classifier>
     </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <type>zip</type>
+      <classifier>${jni.classifier}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <classifier>javadoc</classifier>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>
@@ -131,6 +143,24 @@
               </artifactItems>
             </configuration>
           </execution>
+          <execution>
+            <id>unpack-forms-extension</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.datalogics.pdfl</groupId>
+                  <artifactId>forms-extension</artifactId>
+                  <classifier>${jni.classifier}</classifier>
+                  <type>zip</type>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/Forms/ExportFormsData/pom.xml b/Forms/ExportFormsData/pom.xml
index 1a8a7a22..39e665f1 100644
--- a/Forms/ExportFormsData/pom.xml
+++ b/Forms/ExportFormsData/pom.xml
@@ -21,18 +21,6 @@
         <jni.classifier>win-x86-64-jni</jni.classifier>
       </properties>
     </profile>
-    <profile>
-      <id>MacArm</id>
-      <activation>
-        <os>
-          <family>mac</family>
-          <arch>aarch64</arch>
-        </os>
-      </activation>
-      <properties>
-        <jni.classifier>mac-arm-64-jni</jni.classifier>
-      </properties>
-    </profile>
     <profile>
       <id>Linux64</id>
       <activation>
@@ -79,6 +67,30 @@
       <version>18.36.0</version>
       <classifier>javadoc</classifier>
     </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <type>zip</type>
+      <classifier>${jni.classifier}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <classifier>javadoc</classifier>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>
@@ -131,6 +143,24 @@
               </artifactItems>
             </configuration>
           </execution>
+          <execution>
+            <id>unpack-forms-extension</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.datalogics.pdfl</groupId>
+                  <artifactId>forms-extension</artifactId>
+                  <classifier>${jni.classifier}</classifier>
+                  <type>zip</type>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/Forms/FlattenForms/pom.xml b/Forms/FlattenForms/pom.xml
index 186f0027..bf07ff54 100644
--- a/Forms/FlattenForms/pom.xml
+++ b/Forms/FlattenForms/pom.xml
@@ -21,18 +21,6 @@
         <jni.classifier>win-x86-64-jni</jni.classifier>
       </properties>
     </profile>
-    <profile>
-      <id>MacArm</id>
-      <activation>
-        <os>
-          <family>mac</family>
-          <arch>aarch64</arch>
-        </os>
-      </activation>
-      <properties>
-        <jni.classifier>mac-arm-64-jni</jni.classifier>
-      </properties>
-    </profile>
     <profile>
       <id>Linux64</id>
       <activation>
@@ -79,6 +67,30 @@
       <version>18.36.0</version>
       <classifier>javadoc</classifier>
     </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <type>zip</type>
+      <classifier>${jni.classifier}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <classifier>javadoc</classifier>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>
@@ -131,6 +143,24 @@
               </artifactItems>
             </configuration>
           </execution>
+          <execution>
+            <id>unpack-forms-extension</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.datalogics.pdfl</groupId>
+                  <artifactId>forms-extension</artifactId>
+                  <classifier>${jni.classifier}</classifier>
+                  <type>zip</type>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/Forms/ImportFormsData/pom.xml b/Forms/ImportFormsData/pom.xml
index 2ccdc125..d27b8044 100644
--- a/Forms/ImportFormsData/pom.xml
+++ b/Forms/ImportFormsData/pom.xml
@@ -21,18 +21,6 @@
         <jni.classifier>win-x86-64-jni</jni.classifier>
       </properties>
     </profile>
-    <profile>
-      <id>MacArm</id>
-      <activation>
-        <os>
-          <family>mac</family>
-          <arch>aarch64</arch>
-        </os>
-      </activation>
-      <properties>
-        <jni.classifier>mac-arm-64-jni</jni.classifier>
-      </properties>
-    </profile>
     <profile>
       <id>Linux64</id>
       <activation>
@@ -79,6 +67,30 @@
       <version>18.36.0</version>
       <classifier>javadoc</classifier>
     </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <type>zip</type>
+      <classifier>${jni.classifier}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>com.datalogics.pdfl</groupId>
+      <artifactId>forms-extension</artifactId>
+      <version>18.37.0</version>
+      <classifier>javadoc</classifier>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>
@@ -131,6 +143,24 @@
               </artifactItems>
             </configuration>
           </execution>
+           <execution>
+            <id>unpack-forms-extension</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.datalogics.pdfl</groupId>
+                  <artifactId>forms-extension</artifactId>
+                  <classifier>${jni.classifier}</classifier>
+                  <type>zip</type>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>