diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle
index dd39cbb5..1580bfce 100644
--- a/HIRS_AttestationCA/build.gradle
+++ b/HIRS_AttestationCA/build.gradle
@@ -25,12 +25,15 @@ dependencies {
     implementation project(':HIRS_Utils')
 
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa:3.0.1'
+    implementation 'com.github.darrachequesne:spring-data-jpa-datatables:6.0.1'
+    implementation 'org.springframework.retry:spring-retry:2.0.0'
 
     implementation libs.bouncycastle
     implementation libs.commons.codec
     implementation libs.commons.lang3
     implementation libs.jakarta.api
     implementation libs.jakarta.xml
+    implementation libs.hibernate.core
     implementation libs.guava
     implementation libs.jackson.core
     implementation libs.jackson.databind
diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/ReferenceManifest.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/ReferenceManifest.java
index 0fda758e..4b363c59 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/ReferenceManifest.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/persist/entity/userdefined/ReferenceManifest.java
@@ -152,4 +152,12 @@ public class ReferenceManifest  extends ArchivableEntity {
         }
         return null;
     }
+
+    public boolean isBase() {
+        return rimType.equals(BASE_RIM);
+    }
+
+    public boolean isSupport() {
+        return rimType.equals(SUPPORT_RIM);
+    }
 }
diff --git a/HIRS_AttestationCAPortal/build.gradle b/HIRS_AttestationCAPortal/build.gradle
index 01ec1516..17280f72 100644
--- a/HIRS_AttestationCAPortal/build.gradle
+++ b/HIRS_AttestationCAPortal/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'java'
     id 'war'
     id "nebula.ospackage" version "9.1.1"
-    id 'org.springframework.boot' version '3.0.1'
+    id 'org.springframework.boot' version '3.0.6'
     id 'io.spring.dependency-management' version '1.1.0'
 }
 
@@ -36,6 +36,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'com.github.darrachequesne:spring-data-jpa-datatables:6.0.1'
     implementation 'org.projectlombok:lombok'
 
     compileOnly 'org.projectlombok:lombok'
diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java
index c9c14302..d03daf12 100644
--- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java
+++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/PersistenceJPAConfig.java
@@ -3,6 +3,7 @@ package hirs.attestationca.portal;
 import hirs.attestationca.persist.entity.userdefined.SupplyChainSettings;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/settings.gradle b/settings.gradle
index dcd004a9..36575dfc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,14 +12,17 @@ dependencyResolutionManagement {
             library('commons-codec', 'commons-codec:commons-codec:1.15')
             library('commons-lang3', 'org.apache.commons:commons-lang3:3.12.0')
             library('bouncycastle', 'org.bouncycastle:bcmail-jdk15on:1.70')
+            library('gson', 'com.google.code.gson:gson:2.10.1')
             library('guava', 'com.google.guava:guava:31.1-jre')
             library('minimal-json', 'com.eclipsesource.minimal-json:minimal-json:0.9.5')
             library('jakarta-servlet', 'org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.0')
             library('jakarta-api', 'jakarta.persistence:jakarta.persistence-api:3.1.0')
             library('jakarta-xml', 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0')
+            library('hibernate-core', 'org.hibernate:hibernate-core:6.1.7.Final')
             library('jackson-core', 'com.fasterxml.jackson.core', 'jackson-core').versionRef('jackson')
             library('jackson-databind', 'com.fasterxml.jackson.core', 'jackson-databind').versionRef('jackson')
             library('pci', 'com.github.marandus:pci-ids:0.3')
+            library('ospackage', 'com.netflix.nebula:gradle-ospackage-plugin:11.2.0')
 //            library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-data-jpa').version('springboot')
 //            library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-web').version('springboot')
 //            library('spring-datajpa', 'org.springframework.boot', 'spring-boot-starter-validation').version('springboot')