diff --git a/Core/ivy.xml b/Core/ivy.xml
index ffdfe848d72656cf135fb5922ffe4783906fb5e4..ed5d177f5bf2bcb082c29dd5f9afc95ade588bcb 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -29,7 +29,7 @@
 
         <dependency conf="core->default" org="com.drewnoakes" name="metadata-extractor" rev="2.11.0"/>
 
-        <dependency conf="core->default" org="com.google.cloud" name="google-cloud-translate" rev="1.70.0"/>
+        <dependency conf="core->default" org="com.google.cloud" name="google-cloud-translate" rev="2.1.11"/>
 
         <dependency conf="core->default" org="com.ethteck.decodetect" name="decodetect-core" rev="0.3"/>
 
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 852b5bcad1f73011cba8aeb743cb760a8d4be1f0..1fb3c684b44c487a547ca1d098786df48450297c 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,113 +1,109 @@
-file.reference.activemq-all-5.11.1.jar=release\\modules\\ext\\activemq-all-5.11.1.jar
-file.reference.animal-sniffer-annotations-1.17.jar=release\\modules\\ext\\animal-sniffer-annotations-1.17.jar
-file.reference.api-common-1.7.0.jar=release\\modules\\ext\\api-common-1.7.0.jar
-file.reference.batik-awt-util-1.6.jar=release\\modules\\ext\\batik-awt-util-1.6.jar
-file.reference.batik-dom-1.6.jar=release\\modules\\ext\\batik-dom-1.6.jar
-file.reference.batik-svg-dom-1.6.jar=release\\modules\\ext\\batik-svg-dom-1.6.jar
-file.reference.batik-svggen-1.6.jar=release\\modules\\ext\\batik-svggen-1.6.jar
-file.reference.batik-util-1.6.jar=release\\modules\\ext\\batik-util-1.6.jar
-file.reference.batik-xml-1.6.jar=release\\modules\\ext\\batik-xml-1.6.jar
-file.reference.bcpkix-jdk15on-1.54.jar=release\\modules\\ext\\bcpkix-jdk15on-1.54.jar
-file.reference.bcprov-ext-jdk15on-1.54.jar=release\\modules\\ext\\bcprov-ext-jdk15on-1.54.jar
-file.reference.bcprov-jdk15on-1.52.jar=release\\modules\\ext\\bcprov-jdk15on-1.52.jar
-file.reference.bcprov-jdk15on-1.54.jar=release\\modules\\ext\\bcprov-jdk15on-1.54.jar
-file.reference.checker-compat-qual-2.5.3.jar=release\\modules\\ext\\checker-compat-qual-2.5.3.jar
-file.reference.commons-dbcp2-2.1.1.jar=release\\modules\\ext\\commons-dbcp2-2.1.1.jar
-file.reference.commons-lang3-3.5.jar=release\\modules\\ext\\commons-lang3-3.5.jar
-file.reference.commons-pool2-2.4.2.jar=release\\modules\\ext\\commons-pool2-2.4.2.jar
-file.reference.java-diff-utils-4.8.jar=release\\modules\\ext\\java-diff-utils-4.8.jar
-file.reference.curator-client-2.8.0.jar=release\\modules\\ext\\curator-client-2.8.0.jar
-file.reference.curator-framework-2.8.0.jar=release\\modules\\ext\\curator-framework-2.8.0.jar
-file.reference.curator-recipes-2.8.0.jar=release\\modules\\ext\\curator-recipes-2.8.0.jar
-file.reference.DatCon.jar=release\\modules\\ext\\DatCon.jar
-file.reference.decodetect-core-0.3.jar=release\\modules\\ext\\decodetect-core-0.3.jar
-file.reference.error_prone_annotations-2.3.2.jar=release\\modules\\ext\\error_prone_annotations-2.3.2.jar
-file.reference.failureaccess-1.0.1.jar=release\\modules\\ext\\failureaccess-1.0.1.jar
-file.reference.gax-1.44.0.jar=release\\modules\\ext\\gax-1.44.0.jar
-file.reference.gax-grpc-1.44.0.jar=release\\modules\\ext\\gax-grpc-1.44.0.jar
-file.reference.gax-httpjson-0.61.0.jar=release\\modules\\ext\\gax-httpjson-0.61.0.jar
-file.reference.google-api-client-1.27.0.jar=release\\modules\\ext\\google-api-client-1.27.0.jar
-file.reference.google-api-services-translate-v2-rev20170525-1.27.0.jar=release\\modules\\ext\\google-api-services-translate-v2-rev20170525-1.27.0.jar
-file.reference.google-auth-library-credentials-0.15.0.jar=release\\modules\\ext\\google-auth-library-credentials-0.15.0.jar
-file.reference.google-auth-library-oauth2-http-0.15.0.jar=release\\modules\\ext\\google-auth-library-oauth2-http-0.15.0.jar
-file.reference.google-cloud-core-1.70.0.jar=release\\modules\\ext\\google-cloud-core-1.70.0.jar
-file.reference.google-cloud-core-grpc-1.70.0.jar=release\\modules\\ext\\google-cloud-core-grpc-1.70.0.jar
-file.reference.google-cloud-core-http-1.70.0.jar=release\\modules\\ext\\google-cloud-core-http-1.70.0.jar
-file.reference.google-cloud-translate-1.70.0.jar=release\\modules\\ext\\google-cloud-translate-1.70.0.jar
-file.reference.google-http-client-1.29.0.jar=release\\modules\\ext\\google-http-client-1.29.0.jar
-file.reference.google-http-client-appengine-1.29.0.jar=release\\modules\\ext\\google-http-client-appengine-1.29.0.jar
-file.reference.google-http-client-jackson2-1.29.0.jar=release\\modules\\ext\\google-http-client-jackson2-1.29.0.jar
-file.reference.google-oauth-client-1.28.0.jar=release\\modules\\ext\\google-oauth-client-1.28.0.jar
-file.reference.grpc-alts-1.19.0.jar=release\\modules\\ext\\grpc-alts-1.19.0.jar
-file.reference.grpc-auth-1.19.0.jar=release\\modules\\ext\\grpc-auth-1.19.0.jar
-file.reference.grpc-context-1.19.0.jar=release\\modules\\ext\\grpc-context-1.19.0.jar
-file.reference.grpc-core-1.19.0.jar=release\\modules\\ext\\grpc-core-1.19.0.jar
-file.reference.grpc-grpclb-1.19.0.jar=release\\modules\\ext\\grpc-grpclb-1.19.0.jar
-file.reference.grpc-netty-shaded-1.19.0.jar=release\\modules\\ext\\grpc-netty-shaded-1.19.0.jar
-file.reference.grpc-protobuf-1.19.0.jar=release\\modules\\ext\\grpc-protobuf-1.19.0.jar
-file.reference.grpc-protobuf-lite-1.19.0.jar=release\\modules\\ext\\grpc-protobuf-lite-1.19.0.jar
-file.reference.grpc-stub-1.19.0.jar=release\\modules\\ext\\grpc-stub-1.19.0.jar
-file.reference.gson-2.7.jar=release\\modules\\ext\\gson-2.7.jar
-file.reference.guava-27.1-android.jar=release\\modules\\ext\\guava-27.1-android.jar
-file.reference.httpclient-4.5.5.jar=release\\modules\\ext\\httpclient-4.5.5.jar
-file.reference.httpcore-4.4.9.jar=release\\modules\\ext\\httpcore-4.4.9.jar
-file.reference.icepdf-core-6.2.2.jar=release\\modules\\ext\\icepdf-core-6.2.2.jar
-file.reference.icepdf-viewer-6.2.2.jar=release\\modules\\ext\\icepdf-viewer-6.2.2.jar
-file.reference.j2objc-annotations-1.1.jar=release\\modules\\ext\\j2objc-annotations-1.1.jar
-file.reference.jackcess-2.2.0.jar=release\\modules\\ext\\jackcess-2.2.0.jar
-file.reference.jackcess-encrypt-2.1.4.jar=release\\modules\\ext\\jackcess-encrypt-2.1.4.jar
-file.reference.jackson-annotations-2.9.0.jar=release\\modules\\ext\\jackson-annotations-2.9.0.jar
-file.reference.jackson-dataformat-csv-2.9.7.jar=release\\modules\\ext\\jackson-dataformat-csv-2.9.7.jar
-file.reference.jai_core-1.1.3.jar=release\\modules\\ext\\jai_core-1.1.3.jar
-file.reference.jai_imageio-1.1.jar=release\\modules\\ext\\jai_imageio-1.1.jar
-file.reference.javax.annotation-api-1.3.2.jar=release\\modules\\ext\\javax.annotation-api-1.3.2.jar
-file.reference.javax.ws.rs-api-2.0.jar=release\\modules\\ext\\javax.ws.rs-api-2.0.jar
+file.reference.DatCon.jar=release/modules/ext/DatCon.jar
+file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar
+file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar
+file.reference.StixLib.jar=release/modules/ext/StixLib.jar
+file.reference.YaraJNIWrapper.jar=release/modules/ext/YaraJNIWrapper.jar
+file.reference.activemq-all-5.11.1.jar=release/modules/ext/activemq-all-5.11.1.jar
+file.reference.animal-sniffer-annotations-1.21.jar=release/modules/ext/animal-sniffer-annotations-1.21.jar
+file.reference.api-common-2.1.4.jar=release/modules/ext/api-common-2.1.4.jar
+file.reference.batik-awt-util-1.6.jar=release/modules/ext/batik-awt-util-1.6.jar
+file.reference.batik-dom-1.6.jar=release/modules/ext/batik-dom-1.6.jar
+file.reference.batik-svg-dom-1.6.jar=release/modules/ext/batik-svg-dom-1.6.jar
+file.reference.batik-svggen-1.6.jar=release/modules/ext/batik-svggen-1.6.jar
+file.reference.batik-util-1.6.jar=release/modules/ext/batik-util-1.6.jar
+file.reference.batik-xml-1.6.jar=release/modules/ext/batik-xml-1.6.jar
+file.reference.bcpkix-jdk15on-1.67.jar=release/modules/ext/bcpkix-jdk15on-1.67.jar
+file.reference.bcprov-ext-jdk15on-1.54.jar=release/modules/ext/bcprov-ext-jdk15on-1.54.jar
+file.reference.bcprov-jdk15on-1.67.jar=release/modules/ext/bcprov-jdk15on-1.67.jar
+file.reference.checker-compat-qual-2.5.3.jar=release/modules/ext/checker-compat-qual-2.5.3.jar
+file.reference.commons-dbcp2-2.1.1.jar=release/modules/ext/commons-dbcp2-2.1.1.jar
+file.reference.commons-lang3-3.5.jar=release/modules/ext/commons-lang3-3.5.jar
+file.reference.commons-pool2-2.4.2.jar=release/modules/ext/commons-pool2-2.4.2.jar
+file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar
+file.reference.curator-framework-2.8.0.jar=release/modules/ext/curator-framework-2.8.0.jar
+file.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0.jar
+file.reference.decodetect-core-0.3.jar=release/modules/ext/decodetect-core-0.3.jar
+file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar
+file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar
+file.reference.gax-2.12.2.jar=release/modules/ext/gax-2.12.2.jar
+file.reference.gax-grpc-2.12.2.jar=release/modules/ext/gax-grpc-2.12.2.jar
+file.reference.gax-httpjson-0.97.2.jar=release/modules/ext/gax-httpjson-0.97.2.jar
+file.reference.google-api-client-1.33.2.jar=release/modules/ext/google-api-client-1.33.2.jar
+file.reference.google-api-services-translate-v2-rev20170525-1.32.1.jar=release/modules/ext/google-api-services-translate-v2-rev20170525-1.32.1.jar
+file.reference.google-auth-library-credentials-1.5.3.jar=release/modules/ext/google-auth-library-credentials-1.5.3.jar
+file.reference.google-auth-library-oauth2-http-1.5.3.jar=release/modules/ext/google-auth-library-oauth2-http-1.5.3.jar
+file.reference.google-cloud-core-2.5.6.jar=release/modules/ext/google-cloud-core-2.5.6.jar
+file.reference.google-cloud-core-grpc-2.5.6.jar=release/modules/ext/google-cloud-core-grpc-2.5.6.jar
+file.reference.google-cloud-core-http-2.5.6.jar=release/modules/ext/google-cloud-core-http-2.5.6.jar
+file.reference.google-cloud-translate-2.1.11.jar=release/modules/ext/google-cloud-translate-2.1.11.jar
+file.reference.google-http-client-1.41.4.jar=release/modules/ext/google-http-client-1.41.4.jar
+file.reference.google-http-client-appengine-1.41.4.jar=release/modules/ext/google-http-client-appengine-1.41.4.jar
+file.reference.google-http-client-jackson2-1.41.4.jar=release/modules/ext/google-http-client-jackson2-1.41.4.jar
+file.reference.google-oauth-client-1.33.1.jar=release/modules/ext/google-oauth-client-1.33.1.jar
+file.reference.grpc-alts-1.44.1.jar=release/modules/ext/grpc-alts-1.44.1.jar
+file.reference.grpc-auth-1.44.1.jar=release/modules/ext/grpc-auth-1.44.1.jar
+file.reference.grpc-context-1.44.1.jar=release/modules/ext/grpc-context-1.44.1.jar
+file.reference.grpc-core-1.44.1.jar=release/modules/ext/grpc-core-1.44.1.jar
+file.reference.grpc-grpclb-1.44.1.jar=release/modules/ext/grpc-grpclb-1.44.1.jar
+file.reference.grpc-netty-shaded-1.44.1.jar=release/modules/ext/grpc-netty-shaded-1.44.1.jar
+file.reference.grpc-protobuf-1.44.1.jar=release/modules/ext/grpc-protobuf-1.44.1.jar
+file.reference.grpc-protobuf-lite-1.44.1.jar=release/modules/ext/grpc-protobuf-lite-1.44.1.jar
+file.reference.grpc-stub-1.44.1.jar=release/modules/ext/grpc-stub-1.44.1.jar
+file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar
+file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar
+file.reference.httpcore-4.4.15.jar=release/modules/ext/httpcore-4.4.15.jar
+file.reference.icepdf-core-6.2.2.jar=release/modules/ext/icepdf-core-6.2.2.jar
+file.reference.icepdf-viewer-6.2.2.jar=release/modules/ext/icepdf-viewer-6.2.2.jar
+file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar
+file.reference.jackcess-2.2.0.jar=release/modules/ext/jackcess-2.2.0.jar
+file.reference.jackcess-encrypt-2.1.4.jar=release/modules/ext/jackcess-encrypt-2.1.4.jar
+file.reference.jackson-annotations-2.9.0.jar=release/modules/ext/jackson-annotations-2.9.0.jar
+file.reference.jackson-dataformat-csv-2.9.7.jar=release/modules/ext/jackson-dataformat-csv-2.9.7.jar
+file.reference.jai_core-1.1.3.jar=release/modules/ext/jai_core-1.1.3.jar
+file.reference.jai_imageio-1.1.jar=release/modules/ext/jai_imageio-1.1.jar
+file.reference.java-diff-utils-4.8.jar=release/modules/ext/java-diff-utils-4.8.jar
+file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar
+file.reference.javax.ws.rs-api-2.0.jar=release/modules/ext/javax.ws.rs-api-2.0.jar
 file.reference.jcommon-1.0.23.jar=release/modules/ext/jcommon-1.0.23.jar
-file.reference.jdom-2.0.5-contrib.jar=release\\modules\\ext\\jdom-2.0.5-contrib.jar
-file.reference.jdom-2.0.5.jar=release\\modules\\ext\\jdom-2.0.5.jar
+file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar
 file.reference.jfreechart-1.0.19.jar=release/modules/ext/jfreechart-1.0.19.jar
-file.reference.jgraphx-4.1.0.jar=release\\modules\\ext\\jgraphx-4.1.0.jar
-file.reference.jline-0.9.94.jar=release\\modules\\ext\\jline-0.9.94.jar
-file.reference.jsoup-1.10.3.jar=release\\modules\\ext\\jsoup-1.10.3.jar
-file.reference.jsr305-3.0.2.jar=release\\modules\\ext\\jsr305-3.0.2.jar
-file.reference.jutf7-1.0.0.jar=release\\modules\\ext\\jutf7-1.0.0.jar
-file.reference.jxmapviewer2-2.4.jar=release\\modules\\ext\\jxmapviewer2-2.4.jar
-file.reference.jython-standalone-2.7.0.jar=release\\modules\\ext\\jython-standalone-2.7.0.jar
-file.reference.libphonenumber-3.5.jar=release\\modules\\ext\\libphonenumber-3.5.jar
-file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release\\modules\\ext\\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
-file.reference.log4j-1.2.16.jar=release\\modules\\ext\\log4j-1.2.16.jar
-file.reference.metadata-extractor-2.11.0.jar=release\\modules\\ext\\metadata-extractor-2.11.0.jar
-file.reference.netty-3.7.0.Final.jar=release\\modules\\ext\\netty-3.7.0.Final.jar
-file.reference.okhttp-2.7.5.jar=release\\modules\\ext\\okhttp-2.7.5.jar
-file.reference.okio-1.6.0.jar=release\\modules\\ext\\okio-1.6.0.jar
-file.reference.opencensus-api-0.19.2.jar=release\\modules\\ext\\opencensus-api-0.19.2.jar
-file.reference.opencensus-contrib-grpc-metrics-0.19.2.jar=release\\modules\\ext\\opencensus-contrib-grpc-metrics-0.19.2.jar
-file.reference.opencensus-contrib-http-util-0.19.2.jar=release\\modules\\ext\\opencensus-contrib-http-util-0.19.2.jar
-file.reference.postgresql-42.2.18.jar=release\\modules\\ext\\postgresql-42.2.18.jar
-file.reference.proto-google-cloud-translate-v3beta1-0.53.0.jar=release\\modules\\ext\\proto-google-cloud-translate-v3beta1-0.53.0.jar
-file.reference.proto-google-common-protos-1.15.0.jar=release\\modules\\ext\\proto-google-common-protos-1.15.0.jar
-file.reference.proto-google-iam-v1-0.12.0.jar=release\\modules\\ext\\proto-google-iam-v1-0.12.0.jar
-file.reference.protobuf-java-3.7.0.jar=release\\modules\\ext\\protobuf-java-3.7.0.jar
-file.reference.protobuf-java-util-3.7.0.jar=release\\modules\\ext\\protobuf-java-util-3.7.0.jar
-file.reference.Rejistry-1.1-SNAPSHOT.jar=release\\modules\\ext\\Rejistry-1.1-SNAPSHOT.jar
-file.reference.sevenzipjbinding-AllPlatforms.jar=release\\modules\\ext\\sevenzipjbinding-AllPlatforms.jar
-file.reference.sevenzipjbinding.jar=release\\modules\\ext\\sevenzipjbinding.jar
+file.reference.jgraphx-4.1.0.jar=release/modules/ext/jgraphx-4.1.0.jar
+file.reference.jline-0.9.94.jar=release/modules/ext/jline-0.9.94.jar
+file.reference.jsoup-1.10.3.jar=release/modules/ext/jsoup-1.10.3.jar
+file.reference.jutf7-1.0.0.jar=release/modules/ext/jutf7-1.0.0.jar
+file.reference.jxmapviewer2-2.4.jar=release/modules/ext/jxmapviewer2-2.4.jar
+file.reference.jython-standalone-2.7.2.jar=release/modules/ext/jython-standalone-2.7.2.jar
+file.reference.libphonenumber-3.5.jar=release/modules/ext/libphonenumber-3.5.jar
+file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+file.reference.log4j-1.2.16.jar=release/modules/ext/log4j-1.2.16.jar
+file.reference.metadata-extractor-2.11.0.jar=release/modules/ext/metadata-extractor-2.11.0.jar
+file.reference.netty-3.7.0.Final.jar=release/modules/ext/netty-3.7.0.Final.jar
+file.reference.okhttp-2.7.5.jar=release/modules/ext/okhttp-2.7.5.jar
+file.reference.okio-1.6.0.jar=release/modules/ext/okio-1.6.0.jar
+file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar
+file.reference.opencensus-contrib-grpc-metrics-0.19.2.jar=release/modules/ext/opencensus-contrib-grpc-metrics-0.19.2.jar
+file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar
+file.reference.postgresql-42.2.18.jar=release/modules/ext/postgresql-42.2.18.jar
+file.reference.proto-google-cloud-translate-v3beta1-0.83.11.jar=release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar
+file.reference.proto-google-common-protos-2.7.4.jar=release/modules/ext/proto-google-common-protos-2.7.4.jar
+file.reference.proto-google-iam-v1-1.2.6.jar=release/modules/ext/proto-google-iam-v1-1.2.6.jar
+file.reference.protobuf-java-3.19.4.jar=release/modules/ext/protobuf-java-3.19.4.jar
+file.reference.protobuf-java-util-3.19.4.jar=release/modules/ext/protobuf-java-util-3.19.4.jar
+file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar
+file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
 file.reference.sleuthkit-4.11.1.jar=release/modules/ext/sleuthkit-4.11.1.jar
 file.reference.sleuthkit-caseuco-4.11.1.jar=release/modules/ext/sleuthkit-caseuco-4.11.1.jar
-file.reference.slf4j-api-1.7.6.jar=release\\modules\\ext\\slf4j-api-1.7.6.jar
-file.reference.slf4j-log4j12-1.7.6.jar=release\\modules\\ext\\slf4j-log4j12-1.7.6.jar
-file.reference.SparseBitSet-1.1.jar=release\\modules\\ext\\SparseBitSet-1.1.jar
-file.reference.StixLib.jar=release\\modules\\ext\\StixLib.jar
-file.reference.threetenbp-1.3.3.jar=release\\modules\\ext\\threetenbp-1.3.3.jar
-file.reference.webp-imageio-sejda-0.1.0.jar=release\\modules\\ext\\webp-imageio-sejda-0.1.0.jar
-file.reference.xmpcore-5.1.3.jar=release\\modules\\ext\\xmpcore-5.1.3.jar
-file.reference.YaraJNIWrapper.jar=release/modules/ext/YaraJNIWrapper.jar
-file.reference.zookeeper-3.4.6.jar=release\\modules\\ext\\zookeeper-3.4.6.jar
+file.reference.slf4j-api-1.7.6.jar=release/modules/ext/slf4j-api-1.7.6.jar
+file.reference.slf4j-log4j12-1.7.6.jar=release/modules/ext/slf4j-log4j12-1.7.6.jar
+file.reference.snakeyaml-1.27.jar=release/modules/ext/snakeyaml-1.27.jar
+file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar
+file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar
+file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar
+file.reference.zookeeper-3.4.6.jar=release/modules/ext/zookeeper-3.4.6.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
 nbm.homepage=http://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
-source.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0-sources.jar
 spec.version.base=10.24
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 0c51d6bacde7a09d583adba5ef2ed2e334ef83d5..47f1e6f9a99ea83e9d031c4ac0dba470b67ab55d 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -347,452 +347,412 @@
                 <package>org.sleuthkit.datamodel.blackboardutils.attributes</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-xml-1.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\batik-xml-1.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-digester-1.8.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-digester-1.8.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jai_core-1.1.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jai_core-1.1.3.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/gax-grpc-1.44.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\gax-grpc-1.44.0.jar</binary-origin>
+                <runtime-relative-path>ext/DatCon.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/DatCon.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/failureaccess-1.0.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\failureaccess-1.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/Rejistry-1.1-SNAPSHOT.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/Rejistry-1.1-SNAPSHOT.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-protobuf-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-protobuf-1.19.0.jar</binary-origin>
+                <runtime-relative-path>ext/SparseBitSet-1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/SparseBitSet-1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/opencensus-api-0.19.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\opencensus-api-0.19.2.jar</binary-origin>
+                <runtime-relative-path>ext/StixLib.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/StixLib.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-svg-dom-1.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\batik-svg-dom-1.6.jar</binary-origin>
+                <runtime-relative-path>ext/YaraJNIWrapper.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/YaraJNIWrapper.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gax-httpjson-0.61.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\gax-httpjson-0.61.0.jar</binary-origin>
+                <runtime-relative-path>ext/activemq-all-5.11.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/activemq-all-5.11.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sevenzipjbinding.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\sevenzipjbinding.jar</binary-origin>
+                <runtime-relative-path>ext/animal-sniffer-annotations-1.21.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/animal-sniffer-annotations-1.21.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/mchange-commons-java-0.2.9.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\mchange-commons-java-0.2.9.jar</binary-origin>
+                <runtime-relative-path>ext/api-common-2.1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/api-common-2.1.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/api-common-1.7.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\api-common-1.7.0.jar</binary-origin>
+                <runtime-relative-path>ext/batik-awt-util-1.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-awt-util-1.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-dataformat-csv-2.9.7.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-dataformat-csv-2.9.7.jar</binary-origin>
+                <runtime-relative-path>ext/batik-dom-1.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-dom-1.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/okhttp-2.7.5.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\okhttp-2.7.5.jar</binary-origin>
+                <runtime-relative-path>ext/batik-svg-dom-1.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-svg-dom-1.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/proto-google-cloud-translate-v3beta1-0.53.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\proto-google-cloud-translate-v3beta1-0.53.0.jar</binary-origin>
+                <runtime-relative-path>ext/batik-svggen-1.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-svggen-1.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/error_prone_annotations-2.3.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\error_prone_annotations-2.3.2.jar</binary-origin>
+                <runtime-relative-path>ext/batik-util-1.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-util-1.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/libphonenumber-3.5.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\libphonenumber-3.5.jar</binary-origin>
+                <runtime-relative-path>ext/batik-xml-1.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/batik-xml-1.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/StixLib.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\StixLib.jar</binary-origin>
+                <runtime-relative-path>ext/bcpkix-jdk15on-1.67.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcpkix-jdk15on-1.67.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-auth-library-credentials-0.15.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-auth-library-credentials-0.15.0.jar</binary-origin>
+                <runtime-relative-path>ext/bcprov-ext-jdk15on-1.54.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcprov-ext-jdk15on-1.54.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-auth-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-auth-1.19.0.jar</binary-origin>
+                <runtime-relative-path>ext/bcprov-jdk15on-1.67.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/bcprov-jdk15on-1.67.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/j2objc-annotations-1.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\j2objc-annotations-1.1.jar</binary-origin>
+                <runtime-relative-path>ext/checker-compat-qual-2.5.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/checker-compat-qual-2.5.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/metadata-extractor-2.11.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\metadata-extractor-2.11.0.jar</binary-origin>
+                <runtime-relative-path>ext/commons-dbcp2-2.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-dbcp2-2.1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/postgresql-42.2.18.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\postgresql-42.2.18.jar</binary-origin>
+                <runtime-relative-path>ext/commons-lang3-3.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang3-3.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-pool2-2.4.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-pool2-2.4.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jxmapviewer2-2.4.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jxmapviewer2-2.4.jar</binary-origin>
+                <binary-origin>release/modules/ext/commons-pool2-2.4.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jdom-2.0.5-contrib.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jdom-2.0.5-contrib.jar</binary-origin>
+                <runtime-relative-path>ext/curator-client-2.8.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curator-client-2.8.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/xmpcore-5.1.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\xmpcore-5.1.3.jar</binary-origin>
+                <runtime-relative-path>ext/curator-framework-2.8.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curator-framework-2.8.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-util-1.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\batik-util-1.6.jar</binary-origin>
+                <runtime-relative-path>ext/curator-recipes-2.8.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/curator-recipes-2.8.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\javax.annotation-api-1.3.2.jar</binary-origin>
+                <runtime-relative-path>ext/decodetect-core-0.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/decodetect-core-0.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jgraphx-4.1.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jgraphx-4.1.0.jar</binary-origin>
+                <runtime-relative-path>ext/error_prone_annotations-2.11.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/error_prone_annotations-2.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jline-0.9.94.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jline-0.9.94.jar</binary-origin>
+                <runtime-relative-path>ext/failureaccess-1.0.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/failureaccess-1.0.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/DatCon.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\DatCon.jar</binary-origin>
+                <runtime-relative-path>ext/gax-2.12.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-2.12.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/okio-1.6.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\okio-1.6.0.jar</binary-origin>
+                <runtime-relative-path>ext/gax-grpc-2.12.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-grpc-2.12.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-jdk15on-1.54.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\bcprov-jdk15on-1.54.jar</binary-origin>
+                <runtime-relative-path>ext/gax-httpjson-0.97.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gax-httpjson-0.97.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/curator-framework-2.8.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\curator-framework-2.8.0.jar</binary-origin>
+                <runtime-relative-path>ext/google-api-client-1.33.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-api-client-1.33.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-dbcp2-2.1.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-dbcp2-2.1.1.jar</binary-origin>
+                <runtime-relative-path>ext/google-api-services-translate-v2-rev20170525-1.32.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-api-services-translate-v2-rev20170525-1.32.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-appengine-1.29.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-http-client-appengine-1.29.0.jar</binary-origin>
+                <runtime-relative-path>ext/google-auth-library-credentials-1.5.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-auth-library-credentials-1.5.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/proto-google-iam-v1-0.12.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\proto-google-iam-v1-0.12.0.jar</binary-origin>
+                <runtime-relative-path>ext/google-auth-library-oauth2-http-1.5.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-auth-library-oauth2-http-1.5.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackcess-encrypt-2.1.4.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackcess-encrypt-2.1.4.jar</binary-origin>
+                <runtime-relative-path>ext/google-cloud-core-2.5.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-cloud-core-2.5.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-1.29.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-http-client-1.29.0.jar</binary-origin>
+                <runtime-relative-path>ext/google-cloud-core-grpc-2.5.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-cloud-core-grpc-2.5.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-ext-jdk15on-1.54.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\bcprov-ext-jdk15on-1.54.jar</binary-origin>
+                <runtime-relative-path>ext/google-cloud-core-http-2.5.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-cloud-core-http-2.5.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-cloud-core-1.70.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-cloud-core-1.70.0.jar</binary-origin>
+                <runtime-relative-path>ext/google-cloud-translate-2.1.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-cloud-translate-2.1.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/protobuf-java-3.7.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\protobuf-java-3.7.0.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-1.41.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-1.41.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcpkix-jdk15on-1.54.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\bcpkix-jdk15on-1.54.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-appengine-1.41.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-appengine-1.41.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-protobuf-lite-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-protobuf-lite-1.19.0.jar</binary-origin>
+                <runtime-relative-path>ext/google-http-client-jackson2-1.41.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-http-client-jackson2-1.41.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/httpcore-4.4.9.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\httpcore-4.4.9.jar</binary-origin>
+                <runtime-relative-path>ext/google-oauth-client-1.33.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/google-oauth-client-1.33.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/guava-27.1-android.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\guava-27.1-android.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-alts-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-alts-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/bcprov-jdk15on-1.52.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\bcprov-jdk15on-1.52.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-auth-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-auth-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/checker-compat-qual-2.5.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\checker-compat-qual-2.5.3.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-context-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-context-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/animal-sniffer-annotations-1.17.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\animal-sniffer-annotations-1.17.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-core-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-core-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/gax-1.44.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\gax-1.44.0.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-grpclb-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-grpclb-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jsoup-1.10.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jsoup-1.10.3.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-netty-shaded-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-netty-shaded-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/YaraJNIWrapper.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/YaraJNIWrapper.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-protobuf-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-protobuf-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-context-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-context-1.19.0.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-protobuf-lite-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-protobuf-lite-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackcess-2.2.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackcess-2.2.0.jar</binary-origin>
+                <runtime-relative-path>ext/grpc-stub-1.44.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/grpc-stub-1.44.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/slf4j-log4j12-1.7.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\slf4j-log4j12-1.7.6.jar</binary-origin>
+                <runtime-relative-path>ext/gson-2.9.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gson-2.9.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-cloud-core-grpc-1.70.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-cloud-core-grpc-1.70.0.jar</binary-origin>
+                <runtime-relative-path>ext/httpclient-4.5.13.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpclient-4.5.13.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/slf4j-api-1.7.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\slf4j-api-1.7.6.jar</binary-origin>
+                <runtime-relative-path>ext/httpcore-4.4.15.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/httpcore-4.4.15.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/decodetect-core-0.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\decodetect-core-0.3.jar</binary-origin>
+                <runtime-relative-path>ext/icepdf-core-6.2.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/icepdf-core-6.2.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/httpclient-4.5.5.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\httpclient-4.5.5.jar</binary-origin>
+                <runtime-relative-path>ext/icepdf-viewer-6.2.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/icepdf-viewer-6.2.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/curator-recipes-2.8.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\curator-recipes-2.8.0.jar</binary-origin>
+                <runtime-relative-path>ext/j2objc-annotations-1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/j2objc-annotations-1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jackson-annotations-2.9.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jackson-annotations-2.9.0.jar</binary-origin>
+                <runtime-relative-path>ext/jackcess-2.2.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackcess-2.2.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang3-3.5.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-lang3-3.5.jar</binary-origin>
+                <runtime-relative-path>ext/jackcess-encrypt-2.1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackcess-encrypt-2.1.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/log4j-1.2.16.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\log4j-1.2.16.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-annotations-2.9.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-annotations-2.9.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</binary-origin>
+                <runtime-relative-path>ext/jackson-dataformat-csv-2.9.7.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jackson-dataformat-csv-2.9.7.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/protobuf-java-util-3.7.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\protobuf-java-util-3.7.0.jar</binary-origin>
+                <runtime-relative-path>ext/jai_core-1.1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jai_core-1.1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-collections-3.2.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-collections-3.2.2.jar</binary-origin>
+                <runtime-relative-path>ext/jai_imageio-1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jai_imageio-1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/java-diff-utils-4.8.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\java-diff-utils-4.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/SparseBitSet-1.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\SparseBitSet-1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/grpc-grpclb-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-grpclb-1.19.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/batik-svggen-1.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\batik-svggen-1.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/c3p0-0.9.5.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\c3p0-0.9.5.jar</binary-origin>
+                <binary-origin>release/modules/ext/java-diff-utils-4.8.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/zookeeper-3.4.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\zookeeper-3.4.6.jar</binary-origin>
+                <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javax.annotation-api-1.3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-alts-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-alts-1.19.0.jar</binary-origin>
+                <runtime-relative-path>ext/javax.ws.rs-api-2.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javax.ws.rs-api-2.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sleuthkit-caseuco-4.11.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sleuthkit-caseuco-4.11.1.jar</binary-origin>
+                <runtime-relative-path>ext/jcommon-1.0.23.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcommon-1.0.23.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jdom-2.0.5.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jdom-2.0.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/gson-2.7.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\gson-2.7.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/google-api-client-1.27.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-api-client-1.27.0.jar</binary-origin>
+                <binary-origin>release/modules/ext/jdom-2.0.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/opencensus-contrib-http-util-0.19.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\opencensus-contrib-http-util-0.19.2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/google-auth-library-oauth2-http-0.15.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-auth-library-oauth2-http-0.15.0.jar</binary-origin>
+                <runtime-relative-path>ext/jfreechart-1.0.19.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jfreechart-1.0.19.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jython-standalone-2.7.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jython-standalone-2.7.2.jar</binary-origin>
+                <runtime-relative-path>ext/jgraphx-4.1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jgraphx-4.1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-lang-2.6.jar</binary-origin>
+                <runtime-relative-path>ext/jline-0.9.94.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jline-0.9.94.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jsr305-3.0.2.jar</binary-origin>
+                <runtime-relative-path>ext/jsoup-1.10.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsoup-1.10.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/proto-google-common-protos-1.15.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\proto-google-common-protos-1.15.0.jar</binary-origin>
+                <runtime-relative-path>ext/jutf7-1.0.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jutf7-1.0.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/netty-3.7.0.Final.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\netty-3.7.0.Final.jar</binary-origin>
+                <runtime-relative-path>ext/jxmapviewer2-2.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jxmapviewer2-2.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jfreechart-1.0.19.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jfreechart-1.0.19.jar</binary-origin>
+                <runtime-relative-path>ext/jython-standalone-2.7.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jython-standalone-2.7.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/opencensus-contrib-grpc-metrics-0.19.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\opencensus-contrib-grpc-metrics-0.19.2.jar</binary-origin>
+                <runtime-relative-path>ext/libphonenumber-3.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/libphonenumber-3.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jai_imageio-1.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jai_imageio-1.1.jar</binary-origin>
+                <runtime-relative-path>ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/curator-client-2.8.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\curator-client-2.8.0.jar</binary-origin>
+                <runtime-relative-path>ext/log4j-1.2.16.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/log4j-1.2.16.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-core-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-core-1.19.0.jar</binary-origin>
+                <runtime-relative-path>ext/metadata-extractor-2.11.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/metadata-extractor-2.11.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javax.ws.rs-api-2.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\javax.ws.rs-api-2.0.jar</binary-origin>
+                <runtime-relative-path>ext/netty-3.7.0.Final.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/netty-3.7.0.Final.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jcommon-1.0.23.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jcommon-1.0.23.jar</binary-origin>
+                <runtime-relative-path>ext/okhttp-2.7.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/okhttp-2.7.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/icepdf-core-6.2.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\icepdf-core-6.2.2.jar</binary-origin>
+                <runtime-relative-path>ext/okio-1.6.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/okio-1.6.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/activemq-all-5.11.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\activemq-all-5.11.1.jar</binary-origin>
+                <runtime-relative-path>ext/opencensus-api-0.31.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/opencensus-api-0.31.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-cloud-core-http-1.70.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-cloud-core-http-1.70.0.jar</binary-origin>
+                <runtime-relative-path>ext/opencensus-contrib-grpc-metrics-0.19.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/opencensus-contrib-grpc-metrics-0.19.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/Rejistry-1.1-SNAPSHOT.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\Rejistry-1.1-SNAPSHOT.jar</binary-origin>
+                <runtime-relative-path>ext/opencensus-contrib-http-util-0.31.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/opencensus-contrib-http-util-0.31.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-beanutils-1.9.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-beanutils-1.9.2.jar</binary-origin>
+                <runtime-relative-path>ext/postgresql-42.2.18.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/postgresql-42.2.18.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-dom-1.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\batik-dom-1.6.jar</binary-origin>
+                <runtime-relative-path>ext/proto-google-cloud-translate-v3beta1-0.83.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/proto-google-cloud-translate-v3beta1-0.83.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-http-client-jackson2-1.29.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-http-client-jackson2-1.29.0.jar</binary-origin>
+                <runtime-relative-path>ext/proto-google-common-protos-2.7.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/proto-google-common-protos-2.7.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/threetenbp-1.3.3.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\threetenbp-1.3.3.jar</binary-origin>
+                <runtime-relative-path>ext/proto-google-iam-v1-1.2.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/proto-google-iam-v1-1.2.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-cloud-translate-1.70.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-cloud-translate-1.70.0.jar</binary-origin>
+                <runtime-relative-path>ext/protobuf-java-3.19.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/protobuf-java-3.19.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-stub-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-stub-1.19.0.jar</binary-origin>
+                <runtime-relative-path>ext/protobuf-java-util-3.19.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/protobuf-java-util-3.19.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-oauth-client-1.28.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-oauth-client-1.28.0.jar</binary-origin>
+                <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sevenzipjbinding-AllPlatforms.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\sevenzipjbinding-AllPlatforms.jar</binary-origin>
+                <runtime-relative-path>ext/sevenzipjbinding.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sevenzipjbinding.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/sleuthkit-4.11.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sleuthkit-4.11.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jutf7-1.0.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\jutf7-1.0.0.jar</binary-origin>
+                <runtime-relative-path>ext/sleuthkit-caseuco-4.11.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-caseuco-4.11.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/batik-awt-util-1.6.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\batik-awt-util-1.6.jar</binary-origin>
+                <runtime-relative-path>ext/slf4j-api-1.7.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-1.7.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/google-api-services-translate-v2-rev20170525-1.27.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\google-api-services-translate-v2-rev20170525-1.27.0.jar</binary-origin>
+                <runtime-relative-path>ext/slf4j-log4j12-1.7.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-log4j12-1.7.6.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/icepdf-viewer-6.2.2.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\icepdf-viewer-6.2.2.jar</binary-origin>
+                <runtime-relative-path>ext/snakeyaml-1.27.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/snakeyaml-1.27.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/threetenbp-1.5.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/threetenbp-1.5.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/webp-imageio-sejda-0.1.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\webp-imageio-sejda-0.1.0.jar</binary-origin>
+                <binary-origin>release/modules/ext/webp-imageio-sejda-0.1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/grpc-netty-shaded-1.19.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\grpc-netty-shaded-1.19.0.jar</binary-origin>
+                <runtime-relative-path>ext/xmpcore-5.1.3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmpcore-5.1.3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/snakeyaml-1.27.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\snakeyaml-1.27.jar</binary-origin>
+                <runtime-relative-path>ext/zookeeper-3.4.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/zookeeper-3.4.6.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index f4a529620dd61de5324c89d068c3bf63d7f847e7..5d80e9e71e53c82d1b33b0932111a3729c1c0b89 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -18,7 +18,7 @@
         <dependency conf="autopsy_core->default" org="commons-codec" name="commons-codec" rev="1.13"/>
 
         <!-- commmon -->
-        <dependency conf="autopsy_core->*" org="com.google.guava" name="guava" rev="19.0"/>
+        <dependency conf="autopsy_core->default" org="com.google.guava" name="guava" rev="31.0.1-jre"/>
         <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-lang3" rev="3.8.1"/>
         <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-csv" rev="1.4"/>
     
@@ -28,9 +28,11 @@
         <dependency conf="autopsy_core->default" org="commons-logging" name="commons-logging" rev="1.2"/>
         <dependency conf="autopsy_core->default" org="commons-io" name="commons-io" rev="2.5"/>
         <dependency conf="autopsy_core->default" org="log4j" name="log4j" rev="1.2.17"/>
-        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-excelant" rev="4.0.1"/>
-        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-scratchpad" rev="4.0.1"/>
+        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-excelant" rev="4.1.1"/>
+        <dependency conf="autopsy_core->default" org="org.apache.poi" name="poi-scratchpad" rev="4.1.1"/>
         <dependency conf="autopsy_core->default" org="commons-validator" name="commons-validator" rev="1.6"/>
+        <dependency conf="autopsy_core->default" org="org.apache.commons" name="commons-collections4" rev="4.4"/>
+        <dependency conf="autopsy_core->default" org="commons-collections" name="commons-collections" rev="3.2.2"/>
 
         <dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/>
 
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index a640701b340048cd2edc168179b693276aac6e3b..3d98b9b310d58143663ac943f6da93a5e4f97e78 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -7,7 +7,8 @@ file.reference.ant-launcher-1.8.2.jar=release/modules/ext/ant-launcher-1.8.2.jar
 file.reference.common-image-3.2.jar=release/modules/ext/common-image-3.2.jar
 file.reference.common-io-3.2.jar=release/modules/ext/common-io-3.2.jar
 file.reference.common-lang-3.2.jar=release/modules/ext/common-lang-3.2.jar
-file.reference.commons-collections4-4.2.jar=release\\modules\\ext\\commons-collections4-4.2.jar
+file.reference.commons-collections-3.2.2.jar=release\\modules\\ext\\commons-collections-3.2.2.jar
+file.reference.commons-collections4-4.4.jar=release\\modules\\ext\\commons-collections4-4.4.jar
 file.reference.commons-compress-1.18.jar=release/modules/ext/commons-compress-1.18.jar
 file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar
 file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar
@@ -19,7 +20,7 @@ file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar
 file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar
 file.reference.gson-2.8.5.jar=release/modules/ext/gson-2.8.5.jar
 file.reference.gst1-java-core-1.0.0.jar=release\\modules\\ext\\gst1-java-core-1.0.0.jar
-file.reference.guava-19.0.jar=release/modules/ext/guava-19.0.jar
+file.reference.guava-31.0.1-jre.jar=release/modules/ext/guava-31.0.1-jre.jar
 file.reference.imageio-bmp-3.2.jar=release/modules/ext/imageio-bmp-3.2.jar
 file.reference.imageio-core-3.2.jar=release/modules/ext/imageio-core-3.2.jar
 file.reference.imageio-icns-3.2.jar=release/modules/ext/imageio-icns-3.2.jar
@@ -41,29 +42,30 @@ file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.j
 file.reference.jna-5.10.0.jar=release/modules/ext/jna-5.10.0.jar
 file.reference.jna-platform-5.10.0.jar=release/modules/ext/jna-platform-5.10.0.jar
 file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar
-file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
+file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar
 file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar
 file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
 file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar
 file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar
-file.reference.poi-4.0.1.jar=release\\modules\\ext\\poi-4.0.1.jar
-file.reference.poi-excelant-4.0.1.jar=release\\modules\\ext\\poi-excelant-4.0.1.jar
-file.reference.poi-ooxml-4.0.1.jar=release\\modules\\ext\\poi-ooxml-4.0.1.jar
-file.reference.poi-ooxml-schemas-4.0.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar
-file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.jar
+file.reference.poi-4.1.1.jar=release\\modules\\ext\\poi-4.1.1.jar
+file.reference.poi-ooxml-4.1.1.jar=release\\modules\\ext\\poi-ooxml-4.1.1.jar
+file.reference.poi-ooxml-schemas-4.1.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.1.1.jar
+file.reference.poi-scratchpad-4.1.1.jar=release\\modules\\ext\\poi-scratchpad-4.1.1.jar
 file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar
-file.reference.xmlbeans-3.0.2.jar=release/modules/ext/xmlbeans-3.0.2.jar
+file.reference.xmlbeans-3.1.0.jar=release/modules/ext/xmlbeans-3.1.0.jar
 file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar
 file.reference.c3p0-0.9.5.jar=release\\modules\\ext\\c3p0-0.9.5.jar
 file.reference.commons-validator-1.6.jar=release\\modules\\ext\\commons-validator-1.6.jar
 file.reference.sqlite-jdbc-3.25.2.jar=release\\modules\\ext\\sqlite-jdbc-3.25.2.jar
+file.reference.commons-beanutils-1.9.2.jar=release/modules/ext/commons-beanutils-1.9.2.jar
+file.reference.mchange-commons-java-0.2.9.jar=release\\modules\\ext\\mchange-commons-java-0.2.9.jar
+file.reference.commons-digester-1.8.1.jar=release\\modules\\ext\\commons-digester-1.8.1.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-javadoc.jar
 javadoc.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5-javadoc.jar
 javadoc.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-javadoc.jar
 javadoc.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-javadoc.jar
-javadoc.reference.guava-19.0.jar=release/modules/ext/guava-19.0-javadoc.jar
 javadoc.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-javadoc.jar
 javadoc.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-javadoc.jar
 javadoc.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-javadoc.jar
@@ -72,9 +74,7 @@ source.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-sources
 source.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5-sources.jar
 source.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-sources.jar
 source.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-sources.jar
-source.reference.guava-19.0.jar=release/modules/ext/guava-19.0-sources.jar
 source.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-sources.jar
 source.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-sources.jar
 source.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-sources.jar
-file.reference.mchange-commons-java-0.2.9.jar=release\\modules\\ext\\mchange-commons-java-0.2.9.jar
 
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 3e3d92f580745ee6f56a539ac5f8817d7a727ccd..1982be6ce8e8b72bfa7b45719dbf7dded0de2049 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -33,6 +33,8 @@
                 </test-type>
             </test-dependencies>
             <public-packages>
+                <package>org.apache.commons.collections</package>
+                <package>org.apache.xmlbeans</package>
                 <package>org.sqlite</package>
                 <package>com.dd.plist</package>
                 <package>com.fasterxml.jackson.core</package>
@@ -652,6 +654,10 @@
                 <runtime-relative-path>ext/LGoodDatePicker-10.3.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/LGoodDatePicker-10.3.1.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-digester-1.8.1.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\commons-digester-1.8.1.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/c3p0-0.9.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/c3p0-0.9.5.jar</binary-origin>
@@ -680,6 +686,10 @@
                 <runtime-relative-path>ext/imageio-iff-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-iff-3.2.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-beanutils-1.9.2.jar</runtime-relative-path>
+                <binary-origin>release\modules\ext\commons-beanutils-1.9.2.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-icns-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-icns-3.2.jar</binary-origin>
@@ -697,8 +707,8 @@
                 <binary-origin>release/modules/ext/jfxtras-common-8.0-r4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
+                <runtime-relative-path>ext/jsr305-3.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsr305-3.0.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imgscalr-lib-4.2.jar</runtime-relative-path>
@@ -713,8 +723,8 @@
                 <binary-origin>release/modules/ext/common-io-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/xmlbeans-3.0.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlbeans-3.0.2.jar</binary-origin>
+                <runtime-relative-path>ext/xmlbeans-3.1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlbeans-3.1.0.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-tga-3.2.jar</runtime-relative-path>
@@ -725,16 +735,16 @@
                 <binary-origin>release/modules/ext/imageio-pnm-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-scratchpad-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-scratchpad-4.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/poi-scratchpad-4.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-scratchpad-4.1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-psd-3.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/imageio-psd-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-4.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/poi-ooxml-4.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-4.1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-pcx-3.2.jar</runtime-relative-path>
@@ -780,17 +790,21 @@
                 <runtime-relative-path>ext/opencv-248.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/opencv-248.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/guava-19.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-19.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-io-2.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/commons-io-2.5.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/commons-collections4-4.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-collections4-4.2.jar</binary-origin>
+                <runtime-relative-path>ext/commons-collections-3.2.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-collections-3.2.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-collections4-4.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-collections4-4.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/guava-31.0.1-jre.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-31.0.1-jre.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-bmp-3.2.jar</runtime-relative-path>
@@ -813,12 +827,12 @@
                 <binary-origin>release/modules/ext/imageio-core-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-4.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/poi-4.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-4.1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-excelant-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-excelant-4.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/poi-excelant-4.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-excelant-4.1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
@@ -833,8 +847,8 @@
                 <binary-origin>release/modules/ext/common-image-3.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-schemas-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-schemas-4.0.1.jar</binary-origin>
+                <runtime-relative-path>ext/poi-ooxml-schemas-4.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-schemas-4.1.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/imageio-pict-3.2.jar</runtime-relative-path>
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index c72f69919fdedfe7278c7d51020c59f6671028bb..e19dd5efd1505a42a036caf2e99efcea0952fe63 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -21,13 +21,7 @@
         
         <!-- Autopsy -->
         <dependency conf="autopsy->default" org="org.apache.solr" name="solr-solrj" rev="8.11.1"/>
-        <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>
-        <!-- Exclude the version of cxf-rt-rs-client from Tika 1.20, one of its depedencies breaks Ivy -->
-        <dependency conf="autopsy->default" org="org.apache.tika" name="tika-parsers" rev="1.20">
-            <exclude module="cxf-rt-rs-client"/>
-            <exclude module="cleartk-ml"/>
-        </dependency>
-        
+        <dependency conf="autopsy->default" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>       
         <dependency conf="autopsy->default" org="org.apache.cxf" name="cxf-rt-rs-client" rev="3.3.0"/>
         <dependency conf="autopsy->default" org="org.cleartk" name="cleartk-ml" rev="2.0.0"/>
         
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index d0d3372397d96e6b040e1e33f77a73a4e1b419b1..8c0d1ce484ed40fbd1f2b4a9e2329261152a2edd 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -3,12 +3,10 @@ file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar
 file.reference.c3p0-0.9.1.1.jar=release/modules/ext/c3p0-0.9.1.1.jar
 file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar
 file.reference.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar
-file.reference.commons-digester-1.8.1.jar=release\\modules\\ext\\commons-digester-1.8.1.jar
 file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar
 file.reference.commons-io-2.6.jar=release/modules/ext/commons-io-2.6.jar
 file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar
 file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar
-file.reference.guava-18.0.jar=release/modules/ext/guava-18.0.jar
 file.reference.httpclient-4.5.10.jar=release/modules/ext/httpclient-4.5.10.jar
 file.reference.httpcore-4.4.12.jar=release/modules/ext/httpcore-4.4.12.jar
 file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar
@@ -24,10 +22,6 @@ file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar
 file.reference.lucene-core-4.0.0.jar=release/modules/ext/lucene-core-4.0.0.jar
 file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar
 file.reference.opennlp-maxent-3.0.3.jar=release/modules/ext/opennlp-maxent-3.0.3.jar
-file.reference.poi-4.0.1.jar=release/modules/ext/poi-4.0.1.jar
-file.reference.poi-ooxml-4.0.1.jar=release/modules/ext/poi-ooxml-4.0.1.jar
-file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas-4.0.1.jar
-file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar
 file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar
 file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar
 file.reference.slf4j-api-1.7.25.jar=release/modules/ext/slf4j-api-1.7.25.jar
@@ -35,13 +29,9 @@ file.reference.solr-solrj-8.11.1.jar=release/modules/ext/solr-solrj-8.11.1.jar
 file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar
 file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar
 file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar
-file.reference.tika-core-1.20.jar=release/modules/ext/tika-core-1.20.jar
-file.reference.tika-parsers-1.20.jar=release/modules/ext/tika-parsers-1.20.jar
 file.reference.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.jar
 file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar
-file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.jar
 file.reference.woodstox-core-asl-4.4.1.jar=release/modules/ext/woodstox-core-asl-4.4.1.jar
-file.reference.xmlbeans-2.6.0.jar=release/modules/ext/xmlbeans-2.6.0.jar
 file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar
 file.reference.zookeeper-3.6.2.jar=release/modules/ext/zookeeper-3.6.2.jar
 file.reference.annotations-12.0.jar=release\\modules\\ext\\annotations-12.0.jar
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 254b1233283f36c7abfe02df15758cf39254f512..329f64623eb74c480a20e7a64ded56293b318f64 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -216,10 +216,6 @@
                 <package>org.codehaus.stax2.validation</package>
                 <package>org.sleuthkit.autopsy.keywordsearch</package>
             </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-digester-1.8.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-digester-1.8.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jcommander-1.35.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jcommander-1.35.jar</binary-origin>
@@ -268,18 +264,10 @@
                 <runtime-relative-path>ext/icu4j-3.8.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/icu4j-3.8.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-4.0.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/language-detector-0.6.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\language-detector-0.6.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/guava-18.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-18.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/joda-time-2.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/joda-time-2.2.jar</binary-origin>
@@ -308,10 +296,6 @@
                 <runtime-relative-path>ext/ehcache-core-2.6.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/ehcache-core-2.6.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-schemas-4.0.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-schemas-4.0.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/zookeeper-3.6.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/zookeeper-3.6.2.jar</binary-origin>
@@ -336,10 +320,6 @@
                 <runtime-relative-path>ext/solr-solrj-8.11.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/solr-solrj-8.11.1.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/vorbis-java-tika-0.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/vorbis-java-tika-0.8.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/xmpcore-5.1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/xmpcore-5.1.3.jar</binary-origin>
diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties
index 3bf8acc2671edd7b41eb3d514e54464132d8e963..3c92b771557c37e34a8388b3a5876ea875c4a82a 100755
--- a/Tika/nbproject/project.properties
+++ b/Tika/nbproject/project.properties
@@ -10,7 +10,6 @@ file.reference.bzip2-0.9.1.jar=release\\modules\\ext\\bzip2-0.9.1.jar
 file.reference.c3p0-0.9.5.4.jar=release\\modules\\ext\\c3p0-0.9.5.4.jar
 file.reference.cdm-4.5.5.jar=release\\modules\\ext\\cdm-4.5.5.jar
 file.reference.checker-qual-2.8.1.jar=release\\modules\\ext\\checker-qual-2.8.1.jar
-file.reference.commons-collections4-4.4.jar=release\\modules\\ext\\commons-collections4-4.4.jar
 file.reference.commons-compress-1.19.jar=release\\modules\\ext\\commons-compress-1.19.jar
 file.reference.commons-csv-1.7.jar=release\\modules\\ext\\commons-csv-1.7.jar
 file.reference.commons-exec-1.3.jar=release\\modules\\ext\\commons-exec-1.3.jar
@@ -32,7 +31,6 @@ file.reference.fontbox-2.0.17.jar=release\\modules\\ext\\fontbox-2.0.17.jar
 file.reference.geoapi-3.0.1.jar=release\\modules\\ext\\geoapi-3.0.1.jar
 file.reference.grib-4.5.5.jar=release\\modules\\ext\\grib-4.5.5.jar
 file.reference.gson-2.8.6.jar=release\\modules\\ext\\gson-2.8.6.jar
-file.reference.guava-28.1-jre.jar=release\\modules\\ext\\guava-28.1-jre.jar
 file.reference.HikariCP-java7-2.4.13.jar=release\\modules\\ext\\HikariCP-java7-2.4.13.jar
 file.reference.httpclient-4.5.10.jar=release\\modules\\ext\\httpclient-4.5.10.jar
 file.reference.httpcore-4.4.12.jar=release\\modules\\ext\\httpcore-4.4.12.jar
@@ -75,10 +73,6 @@ file.reference.opennlp-tools-1.9.1.jar=release\\modules\\ext\\opennlp-tools-1.9.
 file.reference.parso-2.0.11.jar=release\\modules\\ext\\parso-2.0.11.jar
 file.reference.pdfbox-2.0.17.jar=release\\modules\\ext\\pdfbox-2.0.17.jar
 file.reference.pdfbox-tools-2.0.17.jar=release\\modules\\ext\\pdfbox-tools-2.0.17.jar
-file.reference.poi-4.1.1.jar=release\\modules\\ext\\poi-4.1.1.jar
-file.reference.poi-ooxml-4.1.1.jar=release\\modules\\ext\\poi-ooxml-4.1.1.jar
-file.reference.poi-ooxml-schemas-4.1.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.1.1.jar
-file.reference.poi-scratchpad-4.1.1.jar=release\\modules\\ext\\poi-scratchpad-4.1.1.jar
 file.reference.protobuf-java-3.11.0.jar=release\\modules\\ext\\protobuf-java-3.11.0.jar
 file.reference.quartz-2.3.2.jar=release\\modules\\ext\\quartz-2.3.2.jar
 file.reference.rome-1.12.2.jar=release\\modules\\ext\\rome-1.12.2.jar
@@ -104,7 +98,6 @@ file.reference.vorbis-java-tika-0.8.jar=release\\modules\\ext\\vorbis-java-tika-
 file.reference.woodstox-core-5.0.3.jar=release\\modules\\ext\\woodstox-core-5.0.3.jar
 file.reference.xercesImpl-2.12.0.jar=release\\modules\\ext\\xercesImpl-2.12.0.jar
 file.reference.xml-apis-1.4.01.jar=release\\modules\\ext\\xml-apis-1.4.01.jar
-file.reference.xmlbeans-3.1.0.jar=release\\modules\\ext\\xmlbeans-3.1.0.jar
 file.reference.xmlschema-core-2.2.4.jar=release\\modules\\ext\\xmlschema-core-2.2.4.jar
 file.reference.xmpcore-5.1.3.jar=release\\modules\\ext\\xmpcore-5.1.3.jar
 file.reference.xz-1.8.jar=release\\modules\\ext\\xz-1.8.jar
diff --git a/Tika/nbproject/project.xml b/Tika/nbproject/project.xml
index 20cc21d7be60915d27897f8b8b374366b0a4d243..d6776adf222c0059415a217b00ad203a569c5857 100755
--- a/Tika/nbproject/project.xml
+++ b/Tika/nbproject/project.xml
@@ -118,10 +118,6 @@
                 <runtime-relative-path>ext/asm-7.2.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\asm-7.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmlbeans-3.1.0.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\xmlbeans-3.1.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/gson-2.8.6.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\gson-2.8.6.jar</binary-origin>
@@ -162,10 +158,6 @@
                 <runtime-relative-path>ext/jakarta.ws.rs-api-2.1.5.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jakarta.ws.rs-api-2.1.5.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-schemas-4.1.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-ooxml-schemas-4.1.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/fontbox-2.0.17.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\fontbox-2.0.17.jar</binary-origin>
@@ -310,10 +302,6 @@
                 <runtime-relative-path>ext/xml-apis-1.4.01.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\xml-apis-1.4.01.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-4.1.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-ooxml-4.1.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/curvesapi-1.06.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\curvesapi-1.06.jar</binary-origin>
@@ -326,10 +314,6 @@
                 <runtime-relative-path>ext/sis-utility-1.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\sis-utility-1.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/guava-28.1-jre.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\guava-28.1-jre.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/woodstox-core-5.0.3.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\woodstox-core-5.0.3.jar</binary-origin>
@@ -414,10 +398,6 @@
                 <runtime-relative-path>ext/rome-1.12.2.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\rome-1.12.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-4.1.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-4.1.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/udunits-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\udunits-4.5.5.jar</binary-origin>
@@ -446,10 +426,6 @@
                 <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\netcdf4-4.5.5.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-scratchpad-4.1.1.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\poi-scratchpad-4.1.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/cxf-rt-transports-http-3.3.4.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\cxf-rt-transports-http-3.3.4.jar</binary-origin>
@@ -498,10 +474,6 @@
                 <runtime-relative-path>ext/jcip-annotations-1.0.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\jcip-annotations-1.0.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-collections4-4.4.jar</runtime-relative-path>
-                <binary-origin>release\modules\ext\commons-collections4-4.4.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/cxf-core-3.3.4.jar</runtime-relative-path>
                 <binary-origin>release\modules\ext\cxf-core-3.3.4.jar</binary-origin>
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index 9f082b2bb03c2a1516cc899da0366dbfd3f841bf..33d74bb3699edb6390ee204d42de9d0a39079f84 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -5,17 +5,14 @@ file.reference.commons-lang3-3.8.1.jar=release/modules/ext/commons-lang3-3.8.1.j
 file.reference.apache-mime4j-core-0.8.0.jar=release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar
 file.reference.apache-mime4j-dom-0.8.0.jar=release/modules/ext/apache-mime4j-dom-0.8.0-SNAPSHOT.jar
 file.reference.apache-mime4j-mbox-iterator-0.8.0.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.0-SNAPSHOT.jar
-file.reference.guava-19.0.jar=release/modules/ext/guava-19.0.jar
 file.reference.ez-vcard-0.10.5.jar=release/modules/ext/ez-vcard-0.10.5.jar
 file.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar
 file.reference.vinnie-2.0.2.jar=release/modules/ext/vinnie-2.0.2.jar
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
-javadoc.reference.guava-19.0.jar=release/modules/ext/guava-19.0-javadoc.jar
 javadoc.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar
 license.file=../LICENSE-2.0.txt
 nbm.homepage=http://www.sleuthkit.org/autopsy/
 nbm.needs.restart=true
-source.reference.guava-19.0.jar=release/modules/ext/guava-19.0-sources.jar
 source.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar
 spec.version.base=4.0
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index dc11895d68ae9013412d8280e942777d2661bbc8..36a821eb0bb310c6c0c7040c8f60b3cfcc4b8329 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -93,10 +93,6 @@
                 <runtime-relative-path>ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/apache-mime4j-core-0.8.0-SNAPSHOT.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/guava-19.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-19.0.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/java-libpst-0.9.5-SNAPSHOT.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar</binary-origin>