diff --git a/gsrs-fda-substance-extension/pom.xml b/gsrs-fda-substance-extension/pom.xml
index 2b02f3910..d5fdfaf4e 100644
--- a/gsrs-fda-substance-extension/pom.xml
+++ b/gsrs-fda-substance-extension/pom.xml
@@ -168,7 +168,7 @@
         <dependency>
             <groupId>gov.nih.ncats</groupId>
             <artifactId>clinical-trials-api</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>3.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
diff --git a/gsrs-fda-substance-extension/src/main/java/fda/gsrs/substance/exporters/ProductDTOExporter.java b/gsrs-fda-substance-extension/src/main/java/fda/gsrs/substance/exporters/ProductDTOExporter.java
index f8c71f5b2..cc2872967 100644
--- a/gsrs-fda-substance-extension/src/main/java/fda/gsrs/substance/exporters/ProductDTOExporter.java
+++ b/gsrs-fda-substance-extension/src/main/java/fda/gsrs/substance/exporters/ProductDTOExporter.java
@@ -10,7 +10,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.Query;
+import jakarta.persistence.Query;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Collections;
diff --git a/gsrs-module-substance-example/pom.xml b/gsrs-module-substance-example/pom.xml
index 153ee01a3..548a14718 100644
--- a/gsrs-module-substance-example/pom.xml
+++ b/gsrs-module-substance-example/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
-        <jackson.version>2.13.4</jackson.version>
+        <jackson.version>2.16.0</jackson.version>
     </properties>
 
     <build>
@@ -31,8 +31,8 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-                <source>8</source>
-                <target>8</target>
+                <source>${java.version}</source>
+                <target>${java.version}</target>
             </configuration>
         </plugin>
         <!-- Uncomment this for maven public release deployment
@@ -204,7 +204,7 @@
 
         <dependency>
             <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>           	
+            <artifactId>h2</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -331,7 +331,6 @@
             <groupId>gov.nih.ncats</groupId>
             <artifactId>gsrs-module-substances-data-exchange</artifactId>
             <version>${gsrs.substance.version}</version>
-            <scope>test</scope>
         </dependency>
         <!--dependency>
             <groupId>gov.nih.ncats</groupId>
diff --git a/gsrs-module-substance-example/src/main/java/example/GsrsModuleSubstanceApplication.java b/gsrs-module-substance-example/src/main/java/example/GsrsModuleSubstanceApplication.java
index e1c65a2e5..75aae0d51 100644
--- a/gsrs-module-substance-example/src/main/java/example/GsrsModuleSubstanceApplication.java
+++ b/gsrs-module-substance-example/src/main/java/example/GsrsModuleSubstanceApplication.java
@@ -10,7 +10,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 //import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
diff --git a/gsrs-module-substance-example/src/main/resources/application.conf b/gsrs-module-substance-example/src/main/resources/application.conf
index 478c572db..4856e62dc 100644
--- a/gsrs-module-substance-example/src/main/resources/application.conf
+++ b/gsrs-module-substance-example/src/main/resources/application.conf
@@ -2,7 +2,7 @@ include "substances-core.conf"
 
 include "gsrs-h2-local.conf"
 
-include "fda-extension.conf"
+#include "fda-extension.conf"
 gsrs.sessionSecure=false
 #uncomment this setting to change renderer to use USP render settings.
 #substance.renderer.style="USP"
diff --git a/gsrs-module-substance-example/src/test/java/example/structureSearch/BasicLegacyIndexerTest.java b/gsrs-module-substance-example/src/test/java/example/structureSearch/BasicLegacyIndexerTest.java
index 62620e9af..c70e769e2 100644
--- a/gsrs-module-substance-example/src/test/java/example/structureSearch/BasicLegacyIndexerTest.java
+++ b/gsrs-module-substance-example/src/test/java/example/structureSearch/BasicLegacyIndexerTest.java
@@ -20,7 +20,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.io.File;
 import java.io.IOException;
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/gsrs-module-substance-example/src/test/java/example/substance/ChangeSubstanceClassTest.java b/gsrs-module-substance-example/src/test/java/example/substance/ChangeSubstanceClassTest.java
index dc3010b72..592c83900 100644
--- a/gsrs-module-substance-example/src/test/java/example/substance/ChangeSubstanceClassTest.java
+++ b/gsrs-module-substance-example/src/test/java/example/substance/ChangeSubstanceClassTest.java
@@ -10,7 +10,7 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.test.context.support.WithMockUser;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.io.File;
 import java.io.IOException;
 
diff --git a/gsrs-module-substance-example/src/test/java/example/substance/FlexAndExactSearchFullStackTest.java b/gsrs-module-substance-example/src/test/java/example/substance/FlexAndExactSearchFullStackTest.java
index 9514e79b2..c2f4157dd 100644
--- a/gsrs-module-substance-example/src/test/java/example/substance/FlexAndExactSearchFullStackTest.java
+++ b/gsrs-module-substance-example/src/test/java/example/substance/FlexAndExactSearchFullStackTest.java
@@ -13,7 +13,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/gsrs-module-substance-example/src/test/java/example/substance/RelationshipInvertTest.java b/gsrs-module-substance-example/src/test/java/example/substance/RelationshipInvertTest.java
index f9e059192..1da843669 100644
--- a/gsrs-module-substance-example/src/test/java/example/substance/RelationshipInvertTest.java
+++ b/gsrs-module-substance-example/src/test/java/example/substance/RelationshipInvertTest.java
@@ -29,7 +29,7 @@
 import org.springframework.test.context.event.RecordApplicationEvents;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
diff --git a/gsrs-module-substance-example/src/test/java/example/substance/export/AbstractExportSupportingGsrsEntityControllerTest.java b/gsrs-module-substance-example/src/test/java/example/substance/export/AbstractExportSupportingGsrsEntityControllerTest.java
index 37f8d4cf6..03fc21080 100644
--- a/gsrs-module-substance-example/src/test/java/example/substance/export/AbstractExportSupportingGsrsEntityControllerTest.java
+++ b/gsrs-module-substance-example/src/test/java/example/substance/export/AbstractExportSupportingGsrsEntityControllerTest.java
@@ -27,7 +27,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ActiveProfiles;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Field;
 import java.util.*;
 
diff --git a/gsrs-module-substances-api/pom.xml b/gsrs-module-substances-api/pom.xml
index 1642bcf0e..237b11fb9 100644
--- a/gsrs-module-substances-api/pom.xml
+++ b/gsrs-module-substances-api/pom.xml
@@ -12,8 +12,8 @@
     <artifactId>gsrs-module-substances-api</artifactId>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
     </properties>
 
 
diff --git a/gsrs-module-substances-core/pom.xml b/gsrs-module-substances-core/pom.xml
index aef5635aa..fee93828d 100644
--- a/gsrs-module-substances-core/pom.xml
+++ b/gsrs-module-substances-core/pom.xml
@@ -16,8 +16,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
             <!-- Uncomment this for maven public release deployment
@@ -286,12 +286,12 @@
         <dependency>
             <groupId>uk.ac.cam.ch.opsin</groupId>
             <artifactId>opsin-core</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.0</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.15.3</version>
+            <version>1.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -307,6 +307,12 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
             <version>4.5.14</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.coobird</groupId>
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceCoreConfiguration.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceCoreConfiguration.java
index 5fa213c7d..dc6586786 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceCoreConfiguration.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceCoreConfiguration.java
@@ -72,8 +72,8 @@ private static class EmbeddedTomcatCustomizer implements WebServerFactoryCustomi
         @Override
         public void customize(TomcatServletWebServerFactory factory) {
             factory.addConnectorCustomizers((TomcatConnectorCustomizer) connector -> {
-                connector.setAttribute("relaxedPathChars", "<>[\\]^`{|}");
-                connector.setAttribute("relaxedQueryChars", "<>[\\]^`{|}");
+                connector.setProperty("relaxedPathChars", "<>[\\]^`{|}");
+                connector.setProperty("relaxedQueryChars", "<>[\\]^`{|}");
             });
         }
     }
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceEntityServiceImpl.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceEntityServiceImpl.java
index d51d58923..283d81469 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceEntityServiceImpl.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceEntityServiceImpl.java
@@ -41,7 +41,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import javax.swing.text.DefaultStyledDocument;
 import java.io.IOException;
 import java.io.UncheckedIOException;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceValidatorConfig.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceValidatorConfig.java
index 50bd855fa..7940f52c8 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceValidatorConfig.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/SubstanceValidatorConfig.java
@@ -4,8 +4,10 @@
 import gsrs.validator.ValidatorConfig;
 import ix.ginas.models.v1.Substance;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class SubstanceValidatorConfig extends DefaultValidatorConfig {
 
     private Substance.SubstanceClass substanceClass;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/LegacyGinasAppController.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/LegacyGinasAppController.java
index 5ceb51611..c6c75c2dd 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/LegacyGinasAppController.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/LegacyGinasAppController.java
@@ -31,7 +31,7 @@
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/ReIndexController.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/ReIndexController.java
index fd1ea7153..52d8f31b4 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/ReIndexController.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/ReIndexController.java
@@ -13,7 +13,7 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.persistence.Id;
+import jakarta.persistence.Id;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/StructureOCRController.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/StructureOCRController.java
index 81f6d871a..5209a673f 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/StructureOCRController.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/StructureOCRController.java
@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.IOException;
 import java.util.Base64;
 import java.util.Map;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/SubstanceController.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/SubstanceController.java
index 1df712628..7fb3bcea6 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/SubstanceController.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/SubstanceController.java
@@ -25,8 +25,8 @@
 import java.util.stream.Stream;
 
 import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotBlank;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotBlank;
 
 import org.freehep.graphicsio.svg.SVGGraphics2D;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/restValidation/StructureFormatValidator.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/restValidation/StructureFormatValidator.java
index dc0f52a3d..eb5982cb6 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/restValidation/StructureFormatValidator.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/restValidation/StructureFormatValidator.java
@@ -1,7 +1,7 @@
 package gsrs.module.substance.controllers.restValidation;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/restValidation/ValidStructureFormat.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/restValidation/ValidStructureFormat.java
index c7f1971cc..ff7b56924 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/restValidation/ValidStructureFormat.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/controllers/restValidation/ValidStructureFormat.java
@@ -1,7 +1,7 @@
 package gsrs.module.substance.controllers.restValidation;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 import java.lang.annotation.*;
 
 @Documented
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/expanders/basic/BasicRecordExpanderParameters.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/expanders/basic/BasicRecordExpanderParameters.java
index fa1e4a295..ae1b84881 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/expanders/basic/BasicRecordExpanderParameters.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/expanders/basic/BasicRecordExpanderParameters.java
@@ -2,7 +2,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/NSRSCustomCodeExtractorActionFactory.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/NSRSCustomCodeExtractorActionFactory.java
index 979b93c32..5b6d0e357 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/NSRSCustomCodeExtractorActionFactory.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/NSRSCustomCodeExtractorActionFactory.java
@@ -11,6 +11,7 @@
 import ix.ginas.modelBuilders.AbstractSubstanceBuilder;
 import ix.ginas.models.v1.Code;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.ArrayList;
@@ -21,6 +22,7 @@
 
 @Slf4j
 @Data
+@EqualsAndHashCode(callSuper=false)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class NSRSCustomCodeExtractorActionFactory extends BaseActionFactory {
     private String actionName;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/ProteinSequenceExtractorActionFactory.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/ProteinSequenceExtractorActionFactory.java
index f910e2874..8948bb7bd 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/ProteinSequenceExtractorActionFactory.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/ProteinSequenceExtractorActionFactory.java
@@ -9,6 +9,7 @@
 import ix.ginas.modelBuilders.ProteinSubstanceBuilder;
 import ix.ginas.models.v1.Subunit;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
@@ -17,6 +18,7 @@
 
 @Slf4j
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class ProteinSequenceExtractorActionFactory extends BaseActionFactory {
 
     private String subunitDelimiter;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/StructureExtractorActionFactory.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/StructureExtractorActionFactory.java
index 2b247da9c..cd98be863 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/StructureExtractorActionFactory.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/importActionFactories/StructureExtractorActionFactory.java
@@ -13,6 +13,7 @@
 import ix.ginas.models.v1.GinasChemicalStructure;
 import ix.ginas.models.v1.Moiety;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -23,6 +24,7 @@
 import static gsrs.module.substance.importers.SDFImportAdapterFactory.resolveParametersMap;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 @Slf4j
 public class StructureExtractorActionFactory extends BaseActionFactory {
     private String actionName;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/model/MergeProcessingActionParameters.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/model/MergeProcessingActionParameters.java
index a3ba2ec45..8f4001d75 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/model/MergeProcessingActionParameters.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/importers/model/MergeProcessingActionParameters.java
@@ -3,7 +3,7 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/processors/TryToCreateInverseRelationshipEvent.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/processors/TryToCreateInverseRelationshipEvent.java
index cdb4c6a90..90e728b36 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/processors/TryToCreateInverseRelationshipEvent.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/processors/TryToCreateInverseRelationshipEvent.java
@@ -32,6 +32,7 @@ public class TryToCreateInverseRelationshipEvent {
     private UUID originatorUUID;
     private UUID relationshipIdToInvert;
 
+    @Builder.Default
     private CreationMode creationMode = CreationMode.CREATE_IF_MISSING_DEEP_CHECK;
 
     private UUID newRelationshipId;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/CodeRepository.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/CodeRepository.java
index b480c64e7..93c69052c 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/CodeRepository.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/CodeRepository.java
@@ -26,7 +26,7 @@ public interface CodeRepository extends GsrsVersionedRepository<Code, UUID> {
     Long findMaxCodeByCodeSystemAndCodeLikeAndCodeLessThan(@Param("codesystem") String codeSystem, @Param("codelike") String codeLike, @Param("maxcode") Long maxCode);
 
     //hibernate query will not convert uuid into a string so we have to concatenate it with empty string for this to work.
-    @Query("select s from Name s where CONCAT(s.uuid, '') like ?1%")
+    @Query("select s from Name s where SUBSTRING(s.uuid, 1, 8) = ?1")
     List<Code> findByUuidStartingWith(String partialUUID);
 
     List<Code> findByCodeIgnoreCase(String code);
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/NameRepository.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/NameRepository.java
index 015b79344..757092b17 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/NameRepository.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/NameRepository.java
@@ -23,7 +23,7 @@ public interface NameRepository extends GsrsVersionedRepository<Name, UUID> {
     List<Name> findByNameIgnoreCase(String name);
 
     //hibernate query will not convert uuid into a string so we have to concatenate it with empty string for this to work.
-    @Query("select s from Name s where CONCAT(s.uuid, '') like ?1%")
+    @Query("select s from Name s where SUBSTRING(s.uuid, 1, 8) = ?1")
     List<Name> findByUuidStartingWith(String partialUUID);
 
     @Query("select n.uuid from Name n")
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/ReferenceRepository.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/ReferenceRepository.java
index 23a672fc6..73781b678 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/ReferenceRepository.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/ReferenceRepository.java
@@ -16,6 +16,6 @@
 public interface ReferenceRepository extends GsrsVersionedRepository<Reference, UUID> {
 
     //hibernate query will not convert uuid into a string so we have to concatenate it with empty string for this to work.
-    @Query("select s from Reference s where CONCAT(s.uuid, '') like ?1%")
+    @Query("select s from Reference s where SUBSTRING(s.uuid, 1, 8) = ?1")
     List<Reference> findByUuidStartingWith(String partialUUID);
 }
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/SubstanceRepository.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/SubstanceRepository.java
index 36d99a421..62d905a0b 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/SubstanceRepository.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/repository/SubstanceRepository.java
@@ -63,7 +63,7 @@ default Substance findBySubstanceReference(SubstanceReference substanceReference
 
     List<SubstanceSummary> findByNames_Name(String name);
 
-    List<SubstanceSummary> findByNames_StdNameIgnoreCase(String stdName);
+    //List<SubstanceSummary> findByNames_StdNameIgnoreCase(String stdName);
 
     List<SubstanceSummary> findByCodes_CodeIgnoreCase(String code);
     List<SubstanceSummary> findByCodes_CodeAndCodes_CodeSystem(String code, String codeSystem);
@@ -99,7 +99,7 @@ default List<Substance> findSubstanceSummaryByMoieties_Structure_Properties_Term
      * @return
      */
     //hibernate query will not convert uuid into a string so we have to concatenate it with empty string for this to work.
-    @Query("select s from Substance s where CONCAT(s.uuid, '') like ?1%")
+    @Query("select s from Substance s where SUBSTRING(s.uuid, 1, 8) = ?1")
     List<Substance> findByUuidStartingWith(String partialUUID);
     @Query("select case when count(s)> 0 then true else false end from Substance s where s.approvalID= ?1")
     boolean existsByApprovalID(String approvalID);
@@ -170,6 +170,6 @@ default SubstanceReference toSubstanceReference(){
     @Query("select s.id from Substance s")
     List<UUID> getAllIds();
 
-    @Query("select s.id from Substance s where dtype='CHE'")
+    @Query("select s.id from ChemicalSubstance s")
     List<UUID> getAllChemicalIds();
 }
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/scrubbers/InputScrubberParameters.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/scrubbers/InputScrubberParameters.java
index de32b48e3..ff7d36df0 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/scrubbers/InputScrubberParameters.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/scrubbers/InputScrubberParameters.java
@@ -3,7 +3,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/scrubbers/basic/BasicSubstanceScrubberParameters.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/scrubbers/basic/BasicSubstanceScrubberParameters.java
index 231148095..877638416 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/scrubbers/basic/BasicSubstanceScrubberParameters.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/scrubbers/basic/BasicSubstanceScrubberParameters.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/CodeEntityService.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/CodeEntityService.java
index 9187ed1e6..66affaf34 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/CodeEntityService.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/CodeEntityService.java
@@ -31,8 +31,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/EntityManagerSubstanceKeyResolver.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/EntityManagerSubstanceKeyResolver.java
index 71b5853e7..501af948b 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/EntityManagerSubstanceKeyResolver.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/EntityManagerSubstanceKeyResolver.java
@@ -7,9 +7,9 @@
 
 import org.springframework.stereotype.Service;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/RelationshipService.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/RelationshipService.java
index 1b976a138..232acfb7d 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/RelationshipService.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/RelationshipService.java
@@ -7,8 +7,8 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceBulkLoadService.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceBulkLoadService.java
index 65897142e..ddfafec19 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceBulkLoadService.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceBulkLoadService.java
@@ -17,9 +17,9 @@
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
-import javax.annotation.PreDestroy;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.annotation.PreDestroy;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceSequenceSearchService.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceSequenceSearchService.java
index 737724a19..9783f91e1 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceSequenceSearchService.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceSequenceSearchService.java
@@ -34,16 +34,20 @@ public interface SubstanceSequenceSearchService {
     class SequenceSearchRequest{
         private String q;
         private SequenceIndexer.CutoffType type;
+        private String field;
+        private String order;
+        @Builder.Default
         private Double cutoff = 0.8D;
+        @Builder.Default
         private Integer top = 10;
+        @Builder.Default
         private Integer skip=0;
+        @Builder.Default
         private Integer fdim = 10;
-        private String field;
+        @Builder.Default
         private String seqType = "Protein";
 //        private double identity = 0.5D;
 //        private SequenceSearchType searchType = SequenceSearchType.GLOBAL;
-        private String order;
-       
 
         public SanitizedSequenceSearchRequest sanitize() throws IOException {
             return new SanitizedSequenceSearchRequest(this);
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceStructureSearchService.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceStructureSearchService.java
index 5fe0184a9..0b62c3453 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceStructureSearchService.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/services/SubstanceStructureSearchService.java
@@ -31,8 +31,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/NameStandardizerTaskInitializer.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/NameStandardizerTaskInitializer.java
index fdac22774..a77b853a4 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/NameStandardizerTaskInitializer.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/NameStandardizerTaskInitializer.java
@@ -36,12 +36,14 @@
 import gsrs.springUtils.StaticContextAccessor;
 import ix.ginas.models.v1.Name;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 @Slf4j
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class NameStandardizerTaskInitializer extends ScheduledTaskInitializer {
 
     private String regenerateNameValue = "";
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/SQLReportScheduledTaskInitializer.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/SQLReportScheduledTaskInitializer.java
index 2f86631b8..47171d3d7 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/SQLReportScheduledTaskInitializer.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/SQLReportScheduledTaskInitializer.java
@@ -24,6 +24,7 @@
 import gsrs.scheduledTasks.SchedulerPlugin.TaskListener;
 import gsrs.springUtils.StaticContextAccessor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -35,6 +36,7 @@
  */
 @Slf4j
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class SQLReportScheduledTaskInitializer
         extends ScheduledTaskInitializer {
 
diff --git a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/SubstanceRefTaskInitializer.java b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/SubstanceRefTaskInitializer.java
index d6cff63ed..a95f8d4d8 100644
--- a/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/SubstanceRefTaskInitializer.java
+++ b/gsrs-module-substances-core/src/main/java/gsrs/module/substance/tasks/SubstanceRefTaskInitializer.java
@@ -16,6 +16,7 @@
 import ix.ginas.models.v1.Substance;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
@@ -39,6 +40,7 @@
 
 @Slf4j
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class SubstanceRefTaskInitializer extends ScheduledTaskInitializer {
 
     private String reportFilePath;
diff --git a/gsrs-module-substances-core/src/main/java/ix/core/AbstractValueDeserializer.java b/gsrs-module-substances-core/src/main/java/ix/core/AbstractValueDeserializer.java
index 0656b2584..c6764ed6d 100644
--- a/gsrs-module-substances-core/src/main/java/ix/core/AbstractValueDeserializer.java
+++ b/gsrs-module-substances-core/src/main/java/ix/core/AbstractValueDeserializer.java
@@ -10,12 +10,15 @@
 import gsrs.module.substance.repository.ValueRepository;
 import ix.core.models.*;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class AbstractValueDeserializer extends JsonDeserializer<Value> {
 	@Autowired
 	private ValueRepository valueRepository;
diff --git a/gsrs-module-substances-core/src/main/java/ix/core/models/ProcessingJob.java b/gsrs-module-substances-core/src/main/java/ix/core/models/ProcessingJob.java
index fba543794..770456b3a 100644
--- a/gsrs-module-substances-core/src/main/java/ix/core/models/ProcessingJob.java
+++ b/gsrs-module-substances-core/src/main/java/ix/core/models/ProcessingJob.java
@@ -18,7 +18,7 @@
 import ix.core.stats.Statistics;
 import org.springframework.data.annotation.CreatedBy;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.*;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/core/models/ProcessingRecord.java b/gsrs-module-substances-core/src/main/java/ix/core/models/ProcessingRecord.java
index badd6e32b..7ed71a82b 100644
--- a/gsrs-module-substances-core/src/main/java/ix/core/models/ProcessingRecord.java
+++ b/gsrs-module-substances-core/src/main/java/ix/core/models/ProcessingRecord.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonView;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/gsrs-module-substances-core/src/main/java/ix/core/models/Structure.java b/gsrs-module-substances-core/src/main/java/ix/core/models/Structure.java
index 000d05c9d..c47de2904 100644
--- a/gsrs-module-substances-core/src/main/java/ix/core/models/Structure.java
+++ b/gsrs-module-substances-core/src/main/java/ix/core/models/Structure.java
@@ -21,13 +21,11 @@
 import ix.utils.Util;
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.*;
 
@@ -39,13 +37,9 @@
 @Slf4j
 public class Structure extends BaseModel {
 
-
     @Id
-    @GenericGenerator(name = "NullUUIDGenerator", strategy = "ix.ginas.models.generators.NullUUIDGenerator")
+    @GenericGenerator(name = "NullUUIDGenerator", type = ix.ginas.models.generators.NullUUIDGenerator.class)
     @GeneratedValue(generator = "NullUUIDGenerator")
-    //maintain backwards compatibility with old GSRS store it as varchar(40) by basic hibernate will store uuids as binary
-    @Type(type = "uuid-char" )
-    @Column(length =40, updatable = false)
     public UUID id;
 
     @Version
diff --git a/gsrs-module-substances-core/src/main/java/ix/core/models/XRef.java b/gsrs-module-substances-core/src/main/java/ix/core/models/XRef.java
index ab65721d4..8f94d90de 100644
--- a/gsrs-module-substances-core/src/main/java/ix/core/models/XRef.java
+++ b/gsrs-module-substances-core/src/main/java/ix/core/models/XRef.java
@@ -8,7 +8,7 @@
 import ix.core.util.EntityUtils.EntityWrapper;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/CommonDataElementOfCollection.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/CommonDataElementOfCollection.java
index 0bd5a071a..4a138e788 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/CommonDataElementOfCollection.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/CommonDataElementOfCollection.java
@@ -4,7 +4,7 @@
 import ix.core.SingleParent;
 import ix.ginas.models.v1.Substance;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 /**
  * This abstract class is meant as a convenience tool to allow ownership for 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/GinasCommonSimplifiedSubData.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/GinasCommonSimplifiedSubData.java
index 236574722..be201541d 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/GinasCommonSimplifiedSubData.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/GinasCommonSimplifiedSubData.java
@@ -11,7 +11,7 @@
 import ix.ginas.models.serialization.GroupSerializer;
 import ix.ginas.models.serialization.PrincipalDeserializer;
 
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.MappedSuperclass;
 import java.util.Date;
 import java.util.Set;
 import java.util.UUID;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/GinasCommonSubData.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/GinasCommonSubData.java
index bf2d3f599..8ca9a3c9a 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/GinasCommonSubData.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/GinasCommonSubData.java
@@ -10,7 +10,7 @@
 import ix.ginas.models.v1.Reference;
 import ix.ginas.models.v1.Substance;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/NoIdGinasCommonSubData.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/NoIdGinasCommonSubData.java
index 133779a0b..477d81283 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/NoIdGinasCommonSubData.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/NoIdGinasCommonSubData.java
@@ -10,10 +10,10 @@
 import ix.ginas.models.v1.Reference;
 import ix.ginas.models.v1.Substance;
 
-import javax.persistence.Convert;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.PreUpdate;
-import javax.persistence.Transient;
+import jakarta.persistence.Convert;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.PreUpdate;
+import jakarta.persistence.Transient;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/SubstanceReferenceEntityListener.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/SubstanceReferenceEntityListener.java
index d82854714..c632f665e 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/SubstanceReferenceEntityListener.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/SubstanceReferenceEntityListener.java
@@ -8,7 +8,7 @@
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.persistence.PostLoad;
+import jakarta.persistence.PostLoad;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/AgentModification.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/AgentModification.java
index 04fe5e524..0c4d15d0f 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/AgentModification.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/AgentModification.java
@@ -7,7 +7,7 @@
 import ix.ginas.models.GinasCommonSubData;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Amount.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Amount.java
index b0934a1c5..84bb7489d 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Amount.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Amount.java
@@ -6,9 +6,9 @@
 import ix.ginas.models.utils.JSONConstants;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/ChemicalSubstance.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/ChemicalSubstance.java
index 0cef62fc0..a4a809eab 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/ChemicalSubstance.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/ChemicalSubstance.java
@@ -14,7 +14,7 @@
 import ix.ginas.models.utils.JSONEntity;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Code.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Code.java
index 34fdd9fc3..d22b404ce 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Code.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Code.java
@@ -11,7 +11,7 @@
 import ix.ginas.models.utils.JSONConstants;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Component.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Component.java
index 5f5e8cf18..d9674525a 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Component.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Component.java
@@ -5,7 +5,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/DisulfideLink.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/DisulfideLink.java
index 54f9dacb6..64e6ad2f4 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/DisulfideLink.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/DisulfideLink.java
@@ -7,8 +7,8 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSimplifiedSubData;
 
-import javax.persistence.CascadeType;
-import javax.persistence.OneToOne;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.OneToOne;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/GinasChemicalStructure.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/GinasChemicalStructure.java
index b22073631..37f390615 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/GinasChemicalStructure.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/GinasChemicalStructure.java
@@ -17,7 +17,7 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 
 @Entity
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Glycosylation.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Glycosylation.java
index a34e4ac00..a262b99fe 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Glycosylation.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Glycosylation.java
@@ -8,7 +8,7 @@
 import ix.ginas.models.GinasCommonSubData;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Linkage.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Linkage.java
index 7fe75edb3..bae2c5836 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Linkage.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Linkage.java
@@ -8,7 +8,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Material.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Material.java
index a9835b7de..433a99358 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Material.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Material.java
@@ -6,7 +6,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Mixture.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Mixture.java
index ea853c5bf..3b1163bf3 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Mixture.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Mixture.java
@@ -4,7 +4,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/MixtureSubstance.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/MixtureSubstance.java
index a90986f96..62a8ebb78 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/MixtureSubstance.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/MixtureSubstance.java
@@ -4,11 +4,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.persistence.CascadeType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.OneToOne;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.OneToOne;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Modifications.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Modifications.java
index 5df26eeee..f015c48b4 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Modifications.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Modifications.java
@@ -7,10 +7,10 @@
 import ix.ginas.models.utils.JSONEntity;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Moiety.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Moiety.java
index ff10f0174..12ab214e7 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Moiety.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Moiety.java
@@ -12,7 +12,7 @@
 import ix.ginas.models.utils.JSONEntity;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -30,18 +30,16 @@
 @SingleParent
 //@JsonIgnoreProperties({ "id" })
 public class Moiety extends NoIdGinasCommonSubData implements Comparable<Moiety>{
-	public static String JSON_NULL="JSON_NULL";
-	/**
-	 * The UUID of this moiety
-	 */
+    public static String JSON_NULL="JSON_NULL";
+    /**
+     * The UUID of this moiety
+     */
 
-	@Type(type = "uuid-char" )
-	@Column(length =40, updatable = false, unique = true)
-	public UUID uuid;
+    public UUID uuid;
 
     @ManyToOne(cascade = CascadeType.PERSIST)
     @JsonIgnore
-	@ParentReference
+    @ParentReference
     private ChemicalSubstance owner;
 
     public ChemicalSubstance getOwner(){
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Name.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Name.java
index 223ed0bae..bb1ea0f1a 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Name.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Name.java
@@ -20,7 +20,7 @@
 import ix.ginas.models.utils.JSONEntity;
 import org.apache.commons.lang3.ObjectUtils;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 
 @JSONEntity(title = "Name", isFinal = true)
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NameOrg.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NameOrg.java
index 4f1b1fe5e..0bf45b516 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NameOrg.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NameOrg.java
@@ -8,7 +8,7 @@
 import ix.ginas.models.utils.JSONConstants;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Note.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Note.java
index ba347ec12..df0bb808e 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Note.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Note.java
@@ -6,7 +6,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NucleicAcid.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NucleicAcid.java
index 02325d61e..8dcf585da 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NucleicAcid.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NucleicAcid.java
@@ -9,7 +9,7 @@
 import ix.ginas.models.utils.JSONConstants;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 
 @JSONEntity(title = "Nucleic Acid", isFinal = true)
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NucleicAcidSubstance.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NucleicAcidSubstance.java
index 60963cbea..f08008e73 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NucleicAcidSubstance.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/NucleicAcidSubstance.java
@@ -9,7 +9,7 @@
 import ix.ginas.models.GinasSubstanceDefinitionAccess;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.stream.Stream;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/OtherLinks.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/OtherLinks.java
index 7aa1790f1..41bf27fe7 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/OtherLinks.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/OtherLinks.java
@@ -7,7 +7,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Parameter.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Parameter.java
index 998ffb1fd..deaef2a6d 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Parameter.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Parameter.java
@@ -8,7 +8,7 @@
 import ix.ginas.models.GinasCommonSubData;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PhysicalModification.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PhysicalModification.java
index ebff225c7..47a67415c 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PhysicalModification.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PhysicalModification.java
@@ -7,7 +7,7 @@
 import ix.ginas.models.GinasCommonSubData;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PhysicalParameter.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PhysicalParameter.java
index e10240e4f..35707fffd 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PhysicalParameter.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PhysicalParameter.java
@@ -7,7 +7,7 @@
 import ix.ginas.models.GinasCommonSubData;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Polymer.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Polymer.java
index 2fdcd79f3..05e11b333 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Polymer.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Polymer.java
@@ -5,7 +5,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PolymerClassification.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PolymerClassification.java
index c54d18a90..23be13120 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PolymerClassification.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PolymerClassification.java
@@ -10,7 +10,7 @@
 import ix.ginas.models.serialization.KeywordDeserializer;
 import ix.ginas.models.serialization.KeywordListSerializer;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PolymerSubstance.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PolymerSubstance.java
index ffd3a1b5d..8c7a0aa8a 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PolymerSubstance.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/PolymerSubstance.java
@@ -5,11 +5,11 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.persistence.CascadeType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.OneToOne;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.OneToOne;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Property.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Property.java
index bb2f382fe..b2154bc03 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Property.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Property.java
@@ -7,7 +7,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Protein.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Protein.java
index 5f8e36782..9bbdc1b45 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Protein.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Protein.java
@@ -19,7 +19,7 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/ProteinSubstance.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/ProteinSubstance.java
index 5beb5614d..f3807e76b 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/ProteinSubstance.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/ProteinSubstance.java
@@ -13,7 +13,7 @@
 import ix.ginas.models.GinasSubstanceDefinitionAccess;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Reference.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Reference.java
index f291d1798..b18b2869f 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Reference.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Reference.java
@@ -17,7 +17,7 @@
 import ix.ginas.models.utils.JSONConstants;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Relationship.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Relationship.java
index 9c8b1609d..89aefd174 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Relationship.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Relationship.java
@@ -11,7 +11,7 @@
 import ix.ginas.models.utils.JSONEntity;
 import ix.ginas.models.utils.RelationshipUtil;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SiteContainer.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SiteContainer.java
index e04819085..43db8f0ea 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SiteContainer.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SiteContainer.java
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceComponent.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceComponent.java
index 4d8ff8e2e..75889788a 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceComponent.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceComponent.java
@@ -1,6 +1,6 @@
 package ix.ginas.models.v1;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Inheritance
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceGroup1.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceGroup1.java
index 311021993..93496e801 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceGroup1.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceGroup1.java
@@ -4,7 +4,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceGroup1Substance.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceGroup1Substance.java
index 9e5bc5636..278995f40 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceGroup1Substance.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SpecifiedSubstanceGroup1Substance.java
@@ -3,11 +3,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.OneToOne;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.OneToOne;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructuralModification.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructuralModification.java
index af0967857..176840533 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructuralModification.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructuralModification.java
@@ -8,7 +8,7 @@
 import ix.ginas.models.utils.JSONEntity;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructurallyDiverse.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructurallyDiverse.java
index bd4ea4876..54f541fa1 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructurallyDiverse.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructurallyDiverse.java
@@ -12,7 +12,7 @@
 import ix.ginas.models.serialization.KeywordListSerializer;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructurallyDiverseSubstance.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructurallyDiverseSubstance.java
index d9a5b3aea..e1abce459 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructurallyDiverseSubstance.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/StructurallyDiverseSubstance.java
@@ -3,11 +3,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.CascadeType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Inheritance;
-import javax.persistence.OneToOne;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.OneToOne;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Substance.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Substance.java
index c6bc169ad..20595cda9 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Substance.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Substance.java
@@ -14,24 +14,24 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.PrePersist;
-import javax.persistence.PreUpdate;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Index;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreUpdate;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SubstanceReference.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SubstanceReference.java
index 810db4d57..e2d2fdc23 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SubstanceReference.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/SubstanceReference.java
@@ -11,7 +11,7 @@
 import ix.ginas.models.SubstanceReferenceEntityListener;
 import ix.ginas.models.utils.JSONEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 
 @Entity
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Subunit.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Subunit.java
index 0011e2ca1..28b5b17d3 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Subunit.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Subunit.java
@@ -11,7 +11,7 @@
 import ix.ginas.models.GinasCommonData;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Sugar.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Sugar.java
index 440e65dc2..df8d8bf8b 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Sugar.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Sugar.java
@@ -7,7 +7,7 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/TextualDefinition.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/TextualDefinition.java
index 427645f05..a348a3c36 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/TextualDefinition.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/TextualDefinition.java
@@ -3,9 +3,9 @@
 import ix.ginas.models.GinasAccessReferenceControlled;
 import ix.ginas.models.GinasCommonSubData;
 
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Lob;
+import jakarta.persistence.Table;
 import java.util.Collections;
 import java.util.List;
 
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Unit.java b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Unit.java
index dcc301bf0..686b0357f 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Unit.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/models/v1/Unit.java
@@ -15,7 +15,7 @@
 import ix.ginas.models.serialization.IntArrayDeserializer;
 import ix.ginas.models.serialization.IntArraySerializer;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/MixtureValidator.java b/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/MixtureValidator.java
index 2a64d2aca..d9cfb370b 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/MixtureValidator.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/MixtureValidator.java
@@ -10,6 +10,7 @@
 import ix.ginas.utils.validation.AbstractValidatorPlugin;
 import ix.ginas.utils.validation.ValidationUtils;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,6 +21,7 @@
  * Created by katzelda on 5/14/18.
  */
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class MixtureValidator extends AbstractValidatorPlugin<Substance> {
     @Autowired
     private SubstanceRepository substanceRepository;
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/PrimaryDefinitionValidator.java b/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/PrimaryDefinitionValidator.java
index ebd2cb3ea..692ab87e7 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/PrimaryDefinitionValidator.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/PrimaryDefinitionValidator.java
@@ -7,12 +7,14 @@
 import ix.ginas.models.v1.SubstanceReference;
 import ix.ginas.utils.validation.AbstractValidatorPlugin;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Created by katzelda on 5/14/18.
  */
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class PrimaryDefinitionValidator extends AbstractValidatorPlugin<Substance> {
 
     @Autowired
diff --git a/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/tags/TagsValidator.java b/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/tags/TagsValidator.java
index 5eba2cd4d..79fc17124 100644
--- a/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/tags/TagsValidator.java
+++ b/gsrs-module-substances-core/src/main/java/ix/ginas/utils/validation/validators/tags/TagsValidator.java
@@ -6,12 +6,14 @@
 import ix.ginas.models.v1.Substance;
 import ix.ginas.utils.validation.AbstractValidatorPlugin;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import java.util.*;
 
 @Slf4j
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class TagsValidator extends AbstractValidatorPlugin<Substance> {
     /**
      * <h1>Tags Validator</h1>
diff --git a/gsrs-module-substances-core/src/main/resources/substances-core.conf b/gsrs-module-substances-core/src/main/resources/substances-core.conf
index 83c61e2ef..c99796a5b 100644
--- a/gsrs-module-substances-core/src/main/resources/substances-core.conf
+++ b/gsrs-module-substances-core/src/main/resources/substances-core.conf
@@ -94,6 +94,13 @@ gsrs.standardizers.substances = {
     }
 }
 
+gsrs.defaultStagingAreaServiceClass.substances = gsrs.stagingarea.service.DefaultStagingAreaService
+gsrs.defaultStagingAreaEntityService.substances = gsrs.dataexchange.SubstanceStagingAreaEntityService
+gsrs.availableProcessActions.substances = ["gsrs.dataexchange.processingactions.CreateProcessingAction",
+    "gsrs.dataexchange.processingactions.MergeProcessingAction",
+    "gsrs.dataexchange.processingactions.RejectProcessingAction",
+    "gsrs.dataexchange.processingactions.CreateBatchProcessingAction"]
+
 gsrs.validators.substances = [
                                # public Class validatorClass;
                                #  public Class substanceClass;
@@ -477,13 +484,13 @@ gsrs.scheduled-tasks.list=[
       "refApprovalIdCodeSystem" : "FDA UNII"
     }
   },
-  {
-    "scheduledTaskClass" : "gsrs.dataexchange.tasks.CalculateMatchablesScheduledTask",
-    "parameters" : {
-      "autorun": false,
-      "threadCount": 5 # Use max 5 threads, if null or <1 this will use all threads available
-    }
-  },
+#  {
+#    "scheduledTaskClass" : "gsrs.dataexchange.tasks.CalculateMatchablesScheduledTask",
+#    "parameters" : {
+#      "autorun": false,
+#      "threadCount": 5 # Use max 5 threads, if null or <1 this will use all threads available
+#    }
+#  },
   {
     "scheduledTaskClass" : "gsrs.tasks.CalculateStagingAreaMatchablesScheduledTask",
     "parameters" : {
diff --git a/gsrs-module-substances-data-exchange/pom.xml b/gsrs-module-substances-data-exchange/pom.xml
index e36c80351..463ad1a98 100644
--- a/gsrs-module-substances-data-exchange/pom.xml
+++ b/gsrs-module-substances-data-exchange/pom.xml
@@ -58,8 +58,8 @@
     </dependencies>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
     </properties>
     <!-- Uncomment this for maven public release deployment
     <build>
diff --git a/gsrs-module-substances-data-exchange/src/main/java/gsrs/dataexchange/SubstanceStagingAreaEntityService.java b/gsrs-module-substances-data-exchange/src/main/java/gsrs/dataexchange/SubstanceStagingAreaEntityService.java
index 019df7485..0571d63e5 100644
--- a/gsrs-module-substances-data-exchange/src/main/java/gsrs/dataexchange/SubstanceStagingAreaEntityService.java
+++ b/gsrs-module-substances-data-exchange/src/main/java/gsrs/dataexchange/SubstanceStagingAreaEntityService.java
@@ -33,7 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.*;
 import java.util.function.Consumer;
 
diff --git a/gsrs-module-substances-dto/pom.xml b/gsrs-module-substances-dto/pom.xml
index c5ed076c5..d40dbdb35 100644
--- a/gsrs-module-substances-dto/pom.xml
+++ b/gsrs-module-substances-dto/pom.xml
@@ -10,8 +10,8 @@
 
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
     </properties>
 
     <groupId>gov.nih.ncats</groupId>
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/AmountDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/AmountDTO.java
index 1d023d94f..d28f29b9f 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/AmountDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/AmountDTO.java
@@ -4,12 +4,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ChemicalSubstanceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ChemicalSubstanceDTO.java
index f48bae64c..10c885b82 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ChemicalSubstanceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ChemicalSubstanceDTO.java
@@ -2,11 +2,13 @@
 
 import lombok.AccessLevel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class ChemicalSubstanceDTO extends SubstanceDTO{
 
     private StructureDTO structure;
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/CodeDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/CodeDTO.java
index 3d02c9ac6..856f92d41 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/CodeDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/CodeDTO.java
@@ -3,11 +3,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureComponentDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureComponentDTO.java
index 96666e8f0..0e9b010ef 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureComponentDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureComponentDTO.java
@@ -4,6 +4,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.LinkedHashSet;
@@ -11,6 +12,7 @@
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -18,7 +20,9 @@
 public class MixtureComponentDTO extends BaseEditableDTO{
 
     private UUID uuid;
+    @Builder.Default
     private Set<String> access = new LinkedHashSet<>();
+    @Builder.Default
     private Set<UUID> references = new LinkedHashSet<>();
 
     private String type;
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureDTO.java
index d325040a9..12baf3baa 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureDTO.java
@@ -4,6 +4,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
@@ -12,11 +13,13 @@
 
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class MixtureDTO extends SubstanceComponentBaseDTO{
 
     private UUID uuid;
+    @Builder.Default
     private List<MixtureComponentDTO> components = new ArrayList<>();
 }
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureSubstanceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureSubstanceDTO.java
index 2b7b8c4e6..a8ee5ba8f 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureSubstanceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MixtureSubstanceDTO.java
@@ -1,10 +1,12 @@
 package gsrs.substances.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class MixtureSubstanceDTO extends SubstanceDTO{
 
     private MixtureDTO mixture;
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MonomerDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MonomerDTO.java
index 536698ee7..5eab325d2 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MonomerDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/MonomerDTO.java
@@ -4,12 +4,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NameDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NameDTO.java
index 70e9144d7..326687995 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NameDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NameDTO.java
@@ -3,11 +3,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NucleicAcidDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NucleicAcidDTO.java
index f8c574b9e..d9fd550eb 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NucleicAcidDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NucleicAcidDTO.java
@@ -4,6 +4,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
@@ -12,6 +13,7 @@
 
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -21,6 +23,7 @@ public class NucleicAcidDTO extends SubstanceComponentBaseDTO{
 
     private String nucleicAcidType;
 
+    @Builder.Default
     private List<String> nucleicAcidSubType = new ArrayList<>();
 
 
@@ -28,5 +31,6 @@ public class NucleicAcidDTO extends SubstanceComponentBaseDTO{
 
     private String sequenceType;
 
+    @Builder.Default
     private List<SubunitDTO> subunits = new ArrayList<>();
 }
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NucleicAcidSubstanceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NucleicAcidSubstanceDTO.java
index 8c69a921b..730ce4b86 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NucleicAcidSubstanceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/NucleicAcidSubstanceDTO.java
@@ -2,10 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class NucleicAcidSubstanceDTO extends SubstanceDTO{
 
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerClassificationDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerClassificationDTO.java
index ada9fe91a..18db82d71 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerClassificationDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerClassificationDTO.java
@@ -4,11 +4,13 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerDTO.java
index 5ffe68305..c2e195d2c 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerDTO.java
@@ -4,11 +4,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
+
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerSubstanceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerSubstanceDTO.java
index a2ac5e9da..8caeb6baf 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerSubstanceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/PolymerSubstanceDTO.java
@@ -2,10 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class PolymerSubstanceDTO extends SubstanceDTO{
 
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ProteinDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ProteinDTO.java
index 702e16d2d..8c26fc4d6 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ProteinDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ProteinDTO.java
@@ -4,6 +4,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
@@ -12,6 +13,7 @@
 
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -21,5 +23,6 @@ public class ProteinDTO extends SubstanceComponentBaseDTO{
 
     private String proteinSubType;
 
+    @Builder.Default
     private List<SubunitDTO> subunits = new ArrayList<>();
 }
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ProteinSubstanceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ProteinSubstanceDTO.java
index 4b8dd7c6e..bad3b3fc3 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ProteinSubstanceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ProteinSubstanceDTO.java
@@ -2,10 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ProteinSubstanceDTO extends SubstanceDTO{
 
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ReferenceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ReferenceDTO.java
index e39fc3105..c1a02a1cb 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ReferenceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/ReferenceDTO.java
@@ -3,11 +3,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SSG1SubstanceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SSG1SubstanceDTO.java
index 135d7deaa..cac30f220 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SSG1SubstanceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SSG1SubstanceDTO.java
@@ -2,10 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class SSG1SubstanceDTO extends SubstanceDTO{
 
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SpecifiedSubstanceConstituents.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SpecifiedSubstanceConstituents.java
index 917af65ca..54e3e73f8 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SpecifiedSubstanceConstituents.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SpecifiedSubstanceConstituents.java
@@ -4,12 +4,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructurallyDiverseDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructurallyDiverseDTO.java
index b751ba028..c9dce959e 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructurallyDiverseDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructurallyDiverseDTO.java
@@ -5,12 +5,15 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.UUID;
+
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -33,6 +36,7 @@ public class StructurallyDiverseDTO extends SubstanceComponentBaseDTO{
 
     private String partLocation;
 
+    @Builder.Default
     private ArrayList<String> part = new ArrayList<>();
 
     private String infraSpecificType;
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructurallyDiverseSubstanceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructurallyDiverseSubstanceDTO.java
index e7a060186..88439a5d0 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructurallyDiverseSubstanceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructurallyDiverseSubstanceDTO.java
@@ -1,10 +1,12 @@
 package gsrs.substances.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class StructurallyDiverseSubstanceDTO extends SubstanceDTO{
 
     private StructurallyDiverseDTO structurallyDiverse;
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructureDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructureDTO.java
index 1d3ca09c4..b445bba31 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructureDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/StructureDTO.java
@@ -5,6 +5,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.IOException;
@@ -12,6 +13,7 @@
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceComponentBaseDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceComponentBaseDTO.java
index be7fb8aa0..07eb5659f 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceComponentBaseDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceComponentBaseDTO.java
@@ -1,12 +1,14 @@
 package gsrs.substances.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class SubstanceComponentBaseDTO extends BaseEditableDTO{
 
 
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceDTO.java
index 8a745416c..8c65d200c 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceDTO.java
@@ -13,6 +13,7 @@
 
 @SuperBuilder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -41,9 +42,12 @@ public class SubstanceDTO{
     private String approvalID;
     private String approvedBy;
 
+    @Builder.Default
     private SubstanceDefinitionType definitionType = SubstanceDefinitionType.PRIMARY;
+    @Builder.Default
     private SubstanceDefinitionLevel  definitionLevel= SubstanceDefinitionLevel.COMPLETE;
 
+    @Builder.Default
     private SubstanceClass substanceClass = SubstanceClass.concept;
     @Setter(AccessLevel.NONE)
     private LazyFetchedCollection _names;
@@ -54,9 +58,12 @@ public class SubstanceDTO{
     @Setter(AccessLevel.NONE)
     private LazyFetchedCollection _modifications;
 
+    @Builder.Default
     private List<NameDTO> names = new ArrayList<>();
+    @Builder.Default
     private List<CodeDTO> codes= new ArrayList<>();
 
+    @Builder.Default
     private List<ReferenceDTO> references= new ArrayList<>();
 
     @JsonSerialize(using = ToStringSerializer.class)
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceReferenceDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceReferenceDTO.java
index 8bc3005da..ccfff7029 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceReferenceDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubstanceReferenceDTO.java
@@ -4,10 +4,13 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
+
 @Data
+@EqualsAndHashCode(callSuper=false)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
diff --git a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubunitDTO.java b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubunitDTO.java
index 325cfa648..e89b64cac 100644
--- a/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubunitDTO.java
+++ b/gsrs-module-substances-dto/src/main/java/gsrs/substances/dto/SubunitDTO.java
@@ -4,12 +4,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.UUID;
 
 @Builder
 @Data
+@EqualsAndHashCode(callSuper=false)
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/gsrs-module-substances-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/gsrs-module-substances-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index a9650b134..000000000
--- a/gsrs-module-substances-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=gsrs.module.substance.autoconfigure.GsrsSubstanceModuleAutoConfiguration
diff --git a/gsrs-module-substances-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/gsrs-module-substances-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..ae814f605
--- /dev/null
+++ b/gsrs-module-substances-spring-boot-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+gsrs.module.substance.autoconfigure.GsrsSubstanceModuleAutoConfiguration
diff --git a/gsrs-module-substances-spring-boot-starter/pom.xml b/gsrs-module-substances-spring-boot-starter/pom.xml
index 8734d2e14..b307318d5 100644
--- a/gsrs-module-substances-spring-boot-starter/pom.xml
+++ b/gsrs-module-substances-spring-boot-starter/pom.xml
@@ -15,7 +15,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>2.4.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
diff --git a/gsrs-module-substances-tests/pom.xml b/gsrs-module-substances-tests/pom.xml
index c83a3125a..29b04fa4d 100644
--- a/gsrs-module-substances-tests/pom.xml
+++ b/gsrs-module-substances-tests/pom.xml
@@ -10,8 +10,8 @@
 
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
     </properties>
 
     <groupId>gov.nih.ncats</groupId>
diff --git a/gsrs-module-substances-tests/src/main/java/gsrs/substances/tests/AbstractSubstanceJpaEntityTestSuperClass.java b/gsrs-module-substances-tests/src/main/java/gsrs/substances/tests/AbstractSubstanceJpaEntityTestSuperClass.java
index f8f535691..e335b92f9 100644
--- a/gsrs-module-substances-tests/src/main/java/gsrs/substances/tests/AbstractSubstanceJpaEntityTestSuperClass.java
+++ b/gsrs-module-substances-tests/src/main/java/gsrs/substances/tests/AbstractSubstanceJpaEntityTestSuperClass.java
@@ -15,7 +15,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -328,7 +328,7 @@ protected List<GsrsEntityService.CreationResult<Substance>> loadGsrsFile(Resourc
      * @throws IOException if there is a problem parsing the file.
      */
     protected List<GsrsEntityService.CreationResult<Substance>> loadGsrsFile(File gsrsFile) throws IOException {
-        return loadGsrsFile(gsrsFile, null);
+        return loadGsrsFile(gsrsFile, new Substance.SubstanceClass[] {});
     }
         /**
          * Load the specially formatted GSRS format file (often with {@code .gsrs} extension although some
diff --git a/gsrs-module-substances-tests/src/main/java/gsrs/substances/tests/AbstractSubstanceJpaFullStackEntityTest.java b/gsrs-module-substances-tests/src/main/java/gsrs/substances/tests/AbstractSubstanceJpaFullStackEntityTest.java
index efe93aabc..ba160d520 100644
--- a/gsrs-module-substances-tests/src/main/java/gsrs/substances/tests/AbstractSubstanceJpaFullStackEntityTest.java
+++ b/gsrs-module-substances-tests/src/main/java/gsrs/substances/tests/AbstractSubstanceJpaFullStackEntityTest.java
@@ -6,7 +6,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 //@SpringBootTest(classes = {GsrsModuleSubstanceApplication.class})
 //@SpringBootTest
diff --git a/gsrs-ncats-substance-extension/src/main/java/example/ncats/controllers/NCATSSubstanceController.java b/gsrs-ncats-substance-extension/src/main/java/example/ncats/controllers/NCATSSubstanceController.java
index 0c3626a48..23b151eec 100644
--- a/gsrs-ncats-substance-extension/src/main/java/example/ncats/controllers/NCATSSubstanceController.java
+++ b/gsrs-ncats-substance-extension/src/main/java/example/ncats/controllers/NCATSSubstanceController.java
@@ -23,7 +23,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
diff --git a/gsrs-ncats-substance-extension/src/main/java/models/PubChemChemical.java b/gsrs-ncats-substance-extension/src/main/java/models/PubChemChemical.java
index 5795a7abf..cf338da04 100644
--- a/gsrs-ncats-substance-extension/src/main/java/models/PubChemChemical.java
+++ b/gsrs-ncats-substance-extension/src/main/java/models/PubChemChemical.java
@@ -3,12 +3,14 @@
 import gsrs.model.AbstractGsrsEntity;
 import ix.core.models.IndexableRoot;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @IndexableRoot
 //@Backup
 @Data
+@EqualsAndHashCode(callSuper=false)
 @Entity
 @Table(name="PUBCHEM_CHEMICAL")
 public class PubChemChemical extends AbstractGsrsEntity {
diff --git a/gsrs-ncats-substance-extension/src/main/java/models/PubChemOtherId.java b/gsrs-ncats-substance-extension/src/main/java/models/PubChemOtherId.java
index 785b298be..1eeeff6f7 100644
--- a/gsrs-ncats-substance-extension/src/main/java/models/PubChemOtherId.java
+++ b/gsrs-ncats-substance-extension/src/main/java/models/PubChemOtherId.java
@@ -3,15 +3,17 @@
 import gsrs.model.AbstractGsrsEntity;
 import ix.core.models.IndexableRoot;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @IndexableRoot
 //@Backup
 @Data
+@EqualsAndHashCode(callSuper=false)
 @Entity
 @Table(name="PUBCHEM_ID")
 public class PubChemOtherId extends AbstractGsrsEntity {
diff --git a/pom.xml b/pom.xml
index c96d5238b..745494955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,13 +12,13 @@
         <module>gsrs-module-substances-api</module>
         <module>gsrs-module-substances-dto</module>
         <module>gsrs-module-substances-tests</module>
-	<module>gsrs-ncats-substance-extension</module>
+        <module>gsrs-ncats-substance-extension</module>
         <module>gsrs-module-substances-data-exchange</module>
     </modules>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>3.1.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>gov.nih.ncats</groupId>
@@ -31,12 +31,12 @@
         <url>https://github.com/ncats/gsrs-spring-module-substances.git</url>
     </scm>
     <properties>
-        <java.version>1.8</java.version>
-        <spring-cloud.version>Hoxton.SR1</spring-cloud.version>
+        <java.version>17</java.version>
+        <spring-cloud.version>2022.0.5</spring-cloud.version>
         <gsrs.version>3.1.1-SNAPSHOT</gsrs.version>
         <gsrs.substance.version>3.1.1-SNAPSHOT</gsrs.substance.version>
-        <spring-boot.version>2.4.5</spring-boot.version>
-        <log4j2.version>2.17.2</log4j2.version>
+        <spring-boot.version>3.1.0</spring-boot.version>
+        <log4j2.version>2.22.1</log4j2.version>
     </properties>
 
     <licenses>