diff --git a/public-rackmount1/$metadata/index.xml b/public-rackmount1/$metadata/index.xml
index 3d0deaa..b9ab65d 100644
--- a/public-rackmount1/$metadata/index.xml
+++ b/public-rackmount1/$metadata/index.xml
@@ -1,34 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright.-->
+<!-- Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright.-->
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
 
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ServiceRoot_v1.xml">
     <edmx:Include Namespace="ServiceRoot"/>
-    <edmx:Include Namespace="ServiceRoot.v1_6_0"/>
+    <edmx:Include Namespace="ServiceRoot.v1_15_0"/>
   </edmx:Reference>
 
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AccelerationFunction_v1.xml">
     <edmx:Include Namespace="AccelerationFunction"/>
-    <edmx:Include Namespace="AccelerationFunction.v1_0_2"/>
+    <edmx:Include Namespace="AccelerationFunction.v1_0_3"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AccelerationFunctionCollection_v1.xml">
     <edmx:Include Namespace="AccelerationFunctionCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/AccountService_v1.xml">
     <edmx:Include Namespace="AccountService"/>
-    <edmx:Include Namespace="AccountService.v1_7_0"/>
+    <edmx:Include Namespace="AccountService.v1_12_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ActionInfo_v1.xml">
     <edmx:Include Namespace="ActionInfo"/>
-    <edmx:Include Namespace="ActionInfo.v1_1_2"/>
+    <edmx:Include Namespace="ActionInfo.v1_3_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Assembly_v1.xml">
+    <edmx:Include Namespace="Assembly"/>
+    <edmx:Include Namespace="Assembly.v1_4_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Battery_v1.xml">
+    <edmx:Include Namespace="Battery"/>
+    <edmx:Include Namespace="Battery.v1_2_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/BatteryCollection_v1.xml">
+    <edmx:Include Namespace="BatteryCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/BatteryMetrics_v1.xml">
+    <edmx:Include Namespace="BatteryMetrics"/>
+    <edmx:Include Namespace="BatteryMetrics.v1_0_1"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Bios_v1.xml">
     <edmx:Include Namespace="Bios"/>
-    <edmx:Include Namespace="Bios.v1_1_0"/>
+    <edmx:Include Namespace="Bios.v1_2_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Certificate_v1.xml">
     <edmx:Include Namespace="Certificate"/>
-    <edmx:Include Namespace="Certificate.v1_1_1"/>
+    <edmx:Include Namespace="Certificate.v1_6_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
     <edmx:Include Namespace="CertificateCollection"/>
@@ -39,89 +54,118 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateService_v1.xml">
     <edmx:Include Namespace="CertificateService"/>
-    <edmx:Include Namespace="CertificateService.v1_0_2"/>
+    <edmx:Include Namespace="CertificateService.v1_0_4"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Chassis_v1.xml">
     <edmx:Include Namespace="Chassis"/>
-    <edmx:Include Namespace="Chassis.v1_11_0"/>
+    <edmx:Include Namespace="Chassis.v1_22_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ChassisCollection_v1.xml">
     <edmx:Include Namespace="ChassisCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ComputerSystem_v1.xml">
     <edmx:Include Namespace="ComputerSystem"/>
-    <edmx:Include Namespace="ComputerSystem.v1_10_0"/>
+    <edmx:Include Namespace="ComputerSystem.v1_20_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ComputerSystemCollection_v1.xml">
     <edmx:Include Namespace="ComputerSystemCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics_v1.xml">
+    <edmx:Include Namespace="EnvironmentMetrics"/>
+    <edmx:Include Namespace="EnvironmentMetrics.v1_3_0"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EthernetInterface_v1.xml">
     <edmx:Include Namespace="EthernetInterface"/>
-    <edmx:Include Namespace="EthernetInterface.v1_5_1"/>
+    <edmx:Include Namespace="EthernetInterface.v1_9_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EthernetInterfaceCollection_v1.xml">
     <edmx:Include Namespace="EthernetInterfaceCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EventDestination_v1.xml">
     <edmx:Include Namespace="EventDestination"/>
-    <edmx:Include Namespace="EventDestination.v1_7_0"/>
+    <edmx:Include Namespace="EventDestination.v1_13_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EventDestinationCollection_v1.xml">
     <edmx:Include Namespace="EventDestinationCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EventService_v1.xml">
     <edmx:Include Namespace="EventService"/>
-    <edmx:Include Namespace="EventService.v1_5_0"/>
+    <edmx:Include Namespace="EventService.v1_9_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ExternalAccountProvider_v1.xml">
     <edmx:Include Namespace="ExternalAccountProvider"/>
-    <edmx:Include Namespace="ExternalAccountProvider.v1_1_2"/>
+    <edmx:Include Namespace="ExternalAccountProvider.v1_5_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ExternalAccountProviderCollection_v1.xml">
     <edmx:Include Namespace="ExternalAccountProviderCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Fan_v1.xml">
+    <edmx:Include Namespace="Fan"/>
+    <edmx:Include Namespace="Fan.v1_3_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/FanCollection_v1.xml">
+    <edmx:Include Namespace="FanCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/KeyService_v1.xml">
+    <edmx:Include Namespace="KeyService"/>
+    <edmx:Include Namespace="KeyService.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Key_v1.xml">
+    <edmx:Include Namespace="Key"/>
+    <edmx:Include Namespace="Key.v1_2_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/KeyCollection_v1.xml">
+    <edmx:Include Namespace="KeyCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/KeyPolicy_v1.xml">
+    <edmx:Include Namespace="KeyPolicy"/>
+    <edmx:Include Namespace="KeyPolicy.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/KeyPolicyCollection_v1.xml">
+    <edmx:Include Namespace="KeyPolicyCollection"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LogEntry_v1.xml">
     <edmx:Include Namespace="LogEntry"/>
-    <edmx:Include Namespace="LogEntry.v1_5_1"/>
+    <edmx:Include Namespace="LogEntry.v1_14_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LogEntryCollection_v1.xml">
     <edmx:Include Namespace="LogEntryCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LogService_v1.xml">
     <edmx:Include Namespace="LogService"/>
-    <edmx:Include Namespace="LogService.v1_1_3"/>
+    <edmx:Include Namespace="LogService.v1_4_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LogServiceCollection_v1.xml">
     <edmx:Include Namespace="LogServiceCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Manager_v1.xml">
     <edmx:Include Namespace="Manager"/>
-    <edmx:Include Namespace="Manager.v1_7_0"/>
+    <edmx:Include Namespace="Manager.v1_17_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerCollection_v1.xml">
     <edmx:Include Namespace="ManagerCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerAccount_v1.xml">
     <edmx:Include Namespace="ManagerAccount"/>
-    <edmx:Include Namespace="ManagerAccount.v1_5_0"/>
+    <edmx:Include Namespace="ManagerAccount.v1_10_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerAccountCollection_v1.xml">
     <edmx:Include Namespace="ManagerAccountCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerNetworkProtocol_v1.xml">
     <edmx:Include Namespace="ManagerNetworkProtocol"/>
-    <edmx:Include Namespace="ManagerNetworkProtocol.v1_5_0"/>
+    <edmx:Include Namespace="ManagerNetworkProtocol.v1_9_1"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Memory_v1.xml">
     <edmx:Include Namespace="Memory"/>
-    <edmx:Include Namespace="Memory.v1_9_0"/>
+    <edmx:Include Namespace="Memory.v1_17_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/MemoryCollection_v1.xml">
     <edmx:Include Namespace="MemoryCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Message_v1.xml">
     <edmx:Include Namespace="Message"/>
-    <edmx:Include Namespace="Message.v1_0_8"/>
+    <edmx:Include Namespace="Message.v1_1_2"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/MessageRegistry_v1.xml">
     <edmx:Include Namespace="MessageRegistry"/>
@@ -134,52 +178,81 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/MessageRegistryFileCollection_v1.xml">
     <edmx:Include Namespace="MessageRegistryFileCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Port_v1.xml">
+    <edmx:Include Namespace="Port"/>
+    <edmx:Include Namespace="Port.v1_6_!"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PortCollection_v1.xml">
+    <edmx:Include Namespace="PortCollection"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Power_v1.xml">
     <edmx:Include Namespace="Power"/>
-    <edmx:Include Namespace="Power.v1_6_0"/>
+    <edmx:Include Namespace="Power.v1_7_1"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerSubsystem_v1.xml">
+    <edmx:Include Namespace="PowerSubsystem"/>
+    <edmx:Include Namespace="PowerSubsystem.v1_1_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerSupply_v1.xml">
+    <edmx:Include Namespace="PowerSupply"/>
+    <edmx:Include Namespace="PowerSupply.v1_5_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerSupplyCollection_v1.xml">
+    <edmx:Include Namespace="PowerSupplyCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerSupplyMetrics_v1.xml">
+    <edmx:Include Namespace="PowerSupplyMetrics"/>
+    <edmx:Include Namespace="PowerSupplyMetrics.v1_0_1"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Processor_v1.xml">
     <edmx:Include Namespace="Processor"/>
-    <edmx:Include Namespace="Processor.v1_7_0"/>
+    <edmx:Include Namespace="Processor.v1_17_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ProcessorCollection_v1.xml">
     <edmx:Include Namespace="ProcessorCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ProcessorMetrics_v1.xml">
     <edmx:Include Namespace="ProcessorMetrics"/>
-    <edmx:Include Namespace="ProcessorMetrics.v1_0_2"/>
+    <edmx:Include Namespace="ProcessorMetrics.v1_6_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Role_v1.xml">
     <edmx:Include Namespace="Role"/>
-    <edmx:Include Namespace="Role.v1_2_4"/>
+    <edmx:Include Namespace="Role.v1_3_1"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RoleCollection_v1.xml">
     <edmx:Include Namespace="RoleCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Sensor_v1.xml">
+    <edmx:Include Namespace="Sensor"/>
+    <edmx:Include Namespace="Sensor.v1_6_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SensorCollection_v1.xml">
+    <edmx:Include Namespace="SensorCollection"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SerialInterface_v1.xml">
     <edmx:Include Namespace="SerialInterface"/>
-    <edmx:Include Namespace="SerialInterface.v1_1_5"/>
+    <edmx:Include Namespace="SerialInterface.v1_1_8"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SerialInterfaceCollection_v1.xml">
     <edmx:Include Namespace="SerialInterfaceCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Session_v1.xml">
     <edmx:Include Namespace="Session"/>
-    <edmx:Include Namespace="Session.v1_2_1"/>
+    <edmx:Include Namespace="Session.v1_6_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SessionCollection_v1.xml">
     <edmx:Include Namespace="SessionCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SessionService_v1.xml">
     <edmx:Include Namespace="SessionService"/>
-    <edmx:Include Namespace="SessionService.v1_1_6"/>
+    <edmx:Include Namespace="SessionService.v1_1_8"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Settings_v1.xml">
-    <edmx:Include Namespace="Settings.v1_3_0"/>
+    <edmx:Include Namespace="Settings.v1_3_5"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SimpleStorage_v1.xml">
     <edmx:Include Namespace="SimpleStorage"/>
-    <edmx:Include Namespace="SimpleStorage.v1_2_3"/>
+    <edmx:Include Namespace="SimpleStorage.v1_3_1"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SimpleStorageCollection_v1.xml">
     <edmx:Include Namespace="SimpleStorageCollection"/>
@@ -189,37 +262,45 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
     <edmx:Include Namespace="SoftwareInventory"/>
-    <edmx:Include Namespace="SoftwareInventory.v1_2_3"/>
+    <edmx:Include Namespace="SoftwareInventory.v1_9_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Task_v1.xml">
     <edmx:Include Namespace="Task"/>
-    <edmx:Include Namespace="Task.v1_4_3"/>
+    <edmx:Include Namespace="Task.v1_7_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/TaskCollection_v1.xml">
     <edmx:Include Namespace="TaskCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/TaskService_v1.xml">
     <edmx:Include Namespace="TaskService"/>
-    <edmx:Include Namespace="TaskService.v1_1_4"/>
+    <edmx:Include Namespace="TaskService.v1_2_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Thermal_v1.xml">
     <edmx:Include Namespace="Thermal"/>
-    <edmx:Include Namespace="Thermal.v1_6_0"/>
+    <edmx:Include Namespace="Thermal.v1_7_1"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ThermalMetrics_v1.xml">
+    <edmx:Include Namespace="ThermalMetrics"/>
+    <edmx:Include Namespace="ThermalMetrics.v1_1_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ThermalSubsystem_v1.xml">
+    <edmx:Include Namespace="ThermalSubsystem"/>
+    <edmx:Include Namespace="ThermalSubsystem.v1_1_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/UpdateService_v1.xml">
     <edmx:Include Namespace="UpdateService"/>
-    <edmx:Include Namespace="UpdateService.v1_8_0"/>
+    <edmx:Include Namespace="UpdateService.v1_11_2"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VirtualMedia_v1.xml">
     <edmx:Include Namespace="VirtualMedia"/>
-    <edmx:Include Namespace="VirtualMedia.v1_3_2"/>
+    <edmx:Include Namespace="VirtualMedia.v1_6_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VirtualMediaCollection_v1.xml">
     <edmx:Include Namespace="VirtualMediaCollection"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VLanNetworkInterface_v1.xml">
     <edmx:Include Namespace="VLanNetworkInterface"/>
-    <edmx:Include Namespace="VLanNetworkInterface.v1_1_4"/>
+    <edmx:Include Namespace="VLanNetworkInterface.v1_3_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/VLanNetworkInterfaceCollection_v1.xml">
     <edmx:Include Namespace="VLanNetworkInterfaceCollection"/>
@@ -232,8 +313,8 @@
   <edmx:DataServices>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Service">
-      <EntityContainer Name="Service" Extends="ServiceRoot.v1_6_0.ServiceContainer"/>
+      <EntityContainer Name="Service" Extends="ServiceRoot.v1_15_0.ServiceContainer"/>
     </Schema>
 
   </edmx:DataServices>
-</edmx:Edmx>
+</edmx:Edmx>
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/Accounts/1/Certificates/index.json b/public-rackmount1/AccountService/Accounts/1/Certificates/index.json
index 54d490c..538946f 100644
--- a/public-rackmount1/AccountService/Accounts/1/Certificates/index.json
+++ b/public-rackmount1/AccountService/Accounts/1/Certificates/index.json
@@ -8,5 +8,5 @@
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/AccountService/Accounts/1/Certificates",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/Accounts/1/index.json b/public-rackmount1/AccountService/Accounts/1/index.json
index a7f8d26..3981ebd 100644
--- a/public-rackmount1/AccountService/Accounts/1/index.json
+++ b/public-rackmount1/AccountService/Accounts/1/index.json
@@ -1,10 +1,14 @@
 {
-    "@odata.type": "#ManagerAccount.v1_5_0.ManagerAccount",
+    "@odata.type": "#ManagerAccount.v1_10_0.ManagerAccount",
     "Id": "1",
     "Name": "User Account",
     "Description": "User Account",
     "Enabled": true,
     "Password": null,
+    "PasswordChangeRequired": false,
+    "AccountTypes": [
+        "Redfish"
+    ],
     "UserName": "Administrator",
     "RoleId": "Administrator",
     "Locked": false,
@@ -17,5 +21,5 @@
         }
     },
     "@odata.id": "/redfish/v1/AccountService/Accounts/1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/Accounts/2/index.json b/public-rackmount1/AccountService/Accounts/2/index.json
index 8373c06..c1f6362 100644
--- a/public-rackmount1/AccountService/Accounts/2/index.json
+++ b/public-rackmount1/AccountService/Accounts/2/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#ManagerAccount.v1_5_0.ManagerAccount",
+    "@odata.type": "#ManagerAccount.v1_10_0.ManagerAccount",
     "Id": "2",
     "Name": "Employee #457",
     "Description": "This user is both a Redfish administrator and a SNMPv3 user.",
@@ -24,5 +24,5 @@
         }
     },
     "@odata.id": "/redfish/v1/AccountService/Accounts/2",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/Accounts/index.json b/public-rackmount1/AccountService/Accounts/index.json
index 93f8696..93d665a 100644
--- a/public-rackmount1/AccountService/Accounts/index.json
+++ b/public-rackmount1/AccountService/Accounts/index.json
@@ -8,5 +8,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/AccountService/Accounts",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/ExternalAccountProviders/ExternalRedfishService/index.json b/public-rackmount1/AccountService/ExternalAccountProviders/ExternalRedfishService/index.json
index 83214eb..6aed2bb 100644
--- a/public-rackmount1/AccountService/ExternalAccountProviders/ExternalRedfishService/index.json
+++ b/public-rackmount1/AccountService/ExternalAccountProviders/ExternalRedfishService/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#ExternalAccountProvider.v1_1_2.ExternalAccountProvider",
+    "@odata.type": "#ExternalAccountProvider.v1_5_0.ExternalAccountProvider",
     "Id": "ExternalRedfishService",
     "Name": "Remote Redfish Service",
     "Description": "Remote Redfish Service providing additional Accounts to this Redfish Service",
@@ -26,5 +26,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/AccountService/ExternalAccountProviders/ExternalRedfishService",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/ExternalAccountProviders/index.json b/public-rackmount1/AccountService/ExternalAccountProviders/index.json
index d34c444..9a38cbf 100644
--- a/public-rackmount1/AccountService/ExternalAccountProviders/index.json
+++ b/public-rackmount1/AccountService/ExternalAccountProviders/index.json
@@ -8,5 +8,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/AccountService/ExternalAccountProviders",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/Roles/Administrator/index.json b/public-rackmount1/AccountService/Roles/Administrator/index.json
index 507796f..6aafc20 100644
--- a/public-rackmount1/AccountService/Roles/Administrator/index.json
+++ b/public-rackmount1/AccountService/Roles/Administrator/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Role.v1_2_4.Role",
+    "@odata.type": "#Role.v1_3_1.Role",
     "Id": "Administrator",
     "Name": "User Role",
     "Description": "Admin User Role",
@@ -16,5 +16,5 @@
         "OemPowerControl"
     ],
     "@odata.id": "/redfish/v1/AccountService/Roles/Administrator",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/Roles/Operator/index.json b/public-rackmount1/AccountService/Roles/Operator/index.json
index 659efb3..cc56cf0 100644
--- a/public-rackmount1/AccountService/Roles/Operator/index.json
+++ b/public-rackmount1/AccountService/Roles/Operator/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Role.v1_2_4.Role",
+    "@odata.type": "#Role.v1_3_1.Role",
     "Id": "Operator",
     "Name": "User Role",
     "Description": "Operator User Role",
@@ -11,5 +11,5 @@
     ],
     "OemPrivileges": [],
     "@odata.id": "/redfish/v1/AccountService/Roles/Operator",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/Roles/ReadOnly/index.json b/public-rackmount1/AccountService/Roles/ReadOnly/index.json
index 7f1e487..b5488b3 100644
--- a/public-rackmount1/AccountService/Roles/ReadOnly/index.json
+++ b/public-rackmount1/AccountService/Roles/ReadOnly/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Role.v1_2_4.Role",
+    "@odata.type": "#Role.v1_3_1.Role",
     "Id": "ReadOnly",
     "Name": "User Role",
     "Description": "ReadOnly User Role",
@@ -10,5 +10,5 @@
     ],
     "OemPrivileges": [],
     "@odata.id": "/redfish/v1/AccountService/Roles/ReadOnly",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/Roles/index.json b/public-rackmount1/AccountService/Roles/index.json
index 82bd471..bc6365e 100644
--- a/public-rackmount1/AccountService/Roles/index.json
+++ b/public-rackmount1/AccountService/Roles/index.json
@@ -14,5 +14,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/AccountService/Roles",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/AccountService/index.json b/public-rackmount1/AccountService/index.json
index d33ca73..254ddf3 100644
--- a/public-rackmount1/AccountService/index.json
+++ b/public-rackmount1/AccountService/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#AccountService.v1_7_0.AccountService",
+    "@odata.type": "#AccountService.v1_12_0.AccountService",
     "Id": "AccountService",
     "Name": "Account Service",
     "Description": "Account Service",
@@ -92,9 +92,25 @@
             }
         ]
     },
+    "OAuth2": {
+        "AccountProviderType": "OAuth2",
+        "ServiceEnabled": true,
+        "ServiceAddresses": [
+            "https://contoso.org/.well-known/oauth-authorization-server"
+        ],
+        "OAuth2Service": {
+            "Mode": "Discovery",
+            "Issuer": "https://contoso.org/services/oauth2",
+            "Audience": [
+                "23:11:8A:33:CF:EA",
+                "92384634-2938-2342-8820-489239905423"
+            ],
+            "OAuthServiceSigningKeys": "ewogICAgImtleXMiOiBbCiAgICAgICAgewogICAgICAgICAgICAiZSI6ICJBUUFCIiwKICAgICAgICAgICAgImtpZCI6ICJvV1F2Tl8tRUxnd25HMzFNTEl4Rm5hTVlfNTd0Wk9FSUVQYnpaYlBqS2FBIiwKICAgICAgICAgICAgImt0eSI6ICJSU0EiLAogICAgICAgICAgICAibiI6ICJvYS1Kb2pkSGw2VHQ3N2Vma2h6aW5MMU9XNmZjMGhjQjloOTN2WUZyRVlPakozRjhfTFh1c1ItMW95MUFKdExZcF9KeVI4Q1ZET28yVGNCaTBuSkhKczF1dkN4WWljX202WE5vMHptVm1VQ2hVMnBYSlBGelZKRGV5VVhIWWVONG5yQ1k4XzlTLXlzWnlKa2RRaWJmeHlBRndUMHdpNlZldF9MYTE4N3JNZUFCU0tXdEdIVmpkOWk1UmhELWNGU1JaNk05M0s2bXFPUUpaX0pMXzJKUU93aGk5dFl4Q2drVVpqc1gyWXowMEZpdUVTWDhHcXRGQlI1UzhIT2p0b2FhZUJrTk5hYWZFOFdSUVl6QlVmOHpiNkVobUFMemc0Z0YxTVhRb3dZV25GcGpzYXcwNVRONHk3SWZJUVhLODlqbGxnbWFkWVVjbndaUmRMc1o2VTdBS1EiCiAgICAgICAgfQogICAgXQp9"
+        }
+    },
     "AdditionalExternalAccountProviders": {
         "@odata.id": "/redfish/v1/AccountService/ExternalAccountProviders"
     },
     "@odata.id": "/redfish/v1/AccountService",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/CertificateService/CertificateLocations/index.json b/public-rackmount1/CertificateService/CertificateLocations/index.json
index 0d8f4ae..a8738e1 100644
--- a/public-rackmount1/CertificateService/CertificateLocations/index.json
+++ b/public-rackmount1/CertificateService/CertificateLocations/index.json
@@ -6,10 +6,16 @@
         "Certificates": [
             {
                 "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1"
+            },
+            {
+                "@odata.id": "/redfish/v1/UpdateService/ClientCertificates/1"
+            },
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/1"
             }
         ]
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/CertificateService/CertificateLocations",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/CertificateService/GenerateCSRActionInfo/index.json b/public-rackmount1/CertificateService/GenerateCSRActionInfo/index.json
index de8862a..13cfd83 100644
--- a/public-rackmount1/CertificateService/GenerateCSRActionInfo/index.json
+++ b/public-rackmount1/CertificateService/GenerateCSRActionInfo/index.json
@@ -1,100 +1,100 @@
-{
-    "@odata.type": "#ActionInfo.v1_1_2.ActionInfo",
-    "Id": "GenerateCSRActionInfo",
-    "Name": "Generate CSR Action Info",
-    "Parameters": [
-        {
-            "Name": "CommonName",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "AlternativeNames",
-            "Required": false,
-            "DataType": "StringArray"
-        },
-        {
-            "Name": "Organization",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "OrganizationalUnit",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "City",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "State",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "Country",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "Email",
-            "Required": false,
-            "DataType": "String"
-        },
-        {
-            "Name": "KeyPairAlgorithm",
-            "Required": true,
-            "DataType": "String",
-            "AllowableValues": [
-                "TPM_ALG_RSA",
-                "TPM_ALG_ECDSA"
-            ]
-        },
-        {
-            "Name": "KeyBitLength",
-            "Required": false,
-            "DataType": "Number"
-        },
-        {
-            "Name": "KeyCurveId",
-            "Required": false,
-            "DataType": "String",
-            "AllowableValues": [
-                "TPM_ECC_NIST_P256",
-                "TPM_ECC_NIST_P384",
-                "TPM_ECC_NIST_P521"
-            ]
-        },
-        {
-            "Name": "CertificateCollection",
-            "Required": true,
-            "DataType": "Object"
-        },
-        {
-            "Name": "KeyUsage",
-            "Required": false,
-            "DataType": "StringArray",
-            "AllowableValues": [
-                "DigitalSignature",
-                "NonRepudiation",
-                "KeyEncipherment",
-                "DataEncipherment",
-                "KeyAgreement",
-                "KeyCertSign",
-                "CRLSigning",
-                "EncipherOnly",
-                "DecipherOnly",
-                "ServerAuthentication",
-                "ClientAuthentication",
-                "CodeSigning",
-                "EmailProtection",
-                "OCSPSigning"
-            ]
-        }
-    ],
-    "Oem": {},
-    "@odata.id": "/redfish/v1/CertificateService/GenerateCSRActionInfo",
-    "@Redfish.Copyright": "Copyright 2018-2019 DMTF. All rights reserved."
-}
+{
+    "@odata.type": "#ActionInfo.v1_3_0.ActionInfo",
+    "Id": "GenerateCSRActionInfo",
+    "Name": "Generate CSR Action Info",
+    "Parameters": [
+        {
+            "Name": "CommonName",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "AlternativeNames",
+            "Required": false,
+            "DataType": "StringArray"
+        },
+        {
+            "Name": "Organization",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "OrganizationalUnit",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "City",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "State",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "Country",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "Email",
+            "Required": false,
+            "DataType": "String"
+        },
+        {
+            "Name": "KeyPairAlgorithm",
+            "Required": true,
+            "DataType": "String",
+            "AllowableValues": [
+                "TPM_ALG_RSA",
+                "TPM_ALG_ECDSA"
+            ]
+        },
+        {
+            "Name": "KeyBitLength",
+            "Required": false,
+            "DataType": "Number"
+        },
+        {
+            "Name": "KeyCurveId",
+            "Required": false,
+            "DataType": "String",
+            "AllowableValues": [
+                "TPM_ECC_NIST_P256",
+                "TPM_ECC_NIST_P384",
+                "TPM_ECC_NIST_P521"
+            ]
+        },
+        {
+            "Name": "CertificateCollection",
+            "Required": true,
+            "DataType": "Object"
+        },
+        {
+            "Name": "KeyUsage",
+            "Required": false,
+            "DataType": "StringArray",
+            "AllowableValues": [
+                "DigitalSignature",
+                "NonRepudiation",
+                "KeyEncipherment",
+                "DataEncipherment",
+                "KeyAgreement",
+                "KeyCertSign",
+                "CRLSigning",
+                "EncipherOnly",
+                "DecipherOnly",
+                "ServerAuthentication",
+                "ClientAuthentication",
+                "CodeSigning",
+                "EmailProtection",
+                "OCSPSigning"
+            ]
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/CertificateService/GenerateCSRActionInfo",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/CertificateService/ReplaceCertificateActionInfo/index.json b/public-rackmount1/CertificateService/ReplaceCertificateActionInfo/index.json
index 1cab285..7df6b44 100644
--- a/public-rackmount1/CertificateService/ReplaceCertificateActionInfo/index.json
+++ b/public-rackmount1/CertificateService/ReplaceCertificateActionInfo/index.json
@@ -1,28 +1,28 @@
-{
-    "@odata.type": "#ActionInfo.v1_1_2.ActionInfo",
-    "Id": "ReplaceCertificateActionInfo",
-    "Name": "Replace Certificate Action Info",
-    "Parameters": [
-        {
-            "Name": "CertificateString",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "CertificateType",
-            "Required": true,
-            "DataType": "String",
-            "AllowableValues": [
-                "PEM"
-            ]
-        },
-        {
-            "Name": "CertificateUri",
-            "Required": true,
-            "DataType": "Object"
-        }
-    ],
-    "Oem": {},
-    "@odata.id": "/redfish/v1/CertificateService/GenerateCSRActionInfo",
-    "@Redfish.Copyright": "Copyright 2018-2019 DMTF. All rights reserved."
-}
+{
+    "@odata.type": "#ActionInfo.v1_3_0.ActionInfo",
+    "Id": "ReplaceCertificateActionInfo",
+    "Name": "Replace Certificate Action Info",
+    "Parameters": [
+        {
+            "Name": "CertificateString",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "CertificateType",
+            "Required": true,
+            "DataType": "String",
+            "AllowableValues": [
+                "PEM"
+            ]
+        },
+        {
+            "Name": "CertificateUri",
+            "Required": true,
+            "DataType": "Object"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/CertificateService/ReplaceCertificateActionInfo",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/CertificateService/index.json b/public-rackmount1/CertificateService/index.json
index c497782..7d8e989 100644
--- a/public-rackmount1/CertificateService/index.json
+++ b/public-rackmount1/CertificateService/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#CertificateService.v1_0_2.CertificateService",
+    "@odata.type": "#CertificateService.v1_0_4.CertificateService",
     "Id": "CertificateService",
     "Name": "Certificate Service",
     "Actions": {
@@ -17,5 +17,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/CertificateService",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Controls/CPU1Freq/index.json b/public-rackmount1/Chassis/1U/Controls/CPU1Freq/index.json
new file mode 100644
index 0000000..71d6784
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Controls/CPU1Freq/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#Control.v1_2_0.Control",
+    "Id": "CPU1Freq",
+    "Name": "CPU #1 Frequency Range",
+    "PhysicalContext": "CPU",
+    "ControlType": "Frequency",
+    "ControlMode": "Automatic",
+    "SettingMin": 2000,
+    "SettingMax": 2400,
+    "SetPointUnits": "Hz",
+    "AllowableMin": 1500,
+    "AllowableMax": 3700,
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Controls/CPU1Freq",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Controls/PowerLimit/index.json b/public-rackmount1/Chassis/1U/Controls/PowerLimit/index.json
new file mode 100644
index 0000000..046f7b0
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Controls/PowerLimit/index.json
@@ -0,0 +1,22 @@
+{
+    "@odata.type": "#Control.v1_2_0.Control",
+    "Id": "PowerLimit",
+    "Name": "System Power Limit",
+    "PhysicalContext": "Chassis",
+    "ControlType": "Power",
+    "ControlMode": "Automatic",
+    "SetPoint": 500,
+    "SetPointUnits": "W",
+    "AllowableMax": 1000,
+    "AllowableMin": 150,
+    "Sensor": {
+        "Reading": 374,
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/TotalPower"
+    },
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Controls/PowerLimit",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Controls/index.json b/public-rackmount1/Chassis/1U/Controls/index.json
new file mode 100644
index 0000000..7ff6e7c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Controls/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#ControlCollection.ControlCollection",
+    "Name": "Chassis controls",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Controls/PowerLimit"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Controls/CPU1Freq"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/Controls",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/EnvironmentMetrics/index.json b/public-rackmount1/Chassis/1U/EnvironmentMetrics/index.json
new file mode 100644
index 0000000..54817b2
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/EnvironmentMetrics/index.json
@@ -0,0 +1,36 @@
+{
+    "@odata.type": "#EnvironmentMetrics.v1_3_0.EnvironmentMetrics",
+    "Name": "Chassis Environment Metrics",
+    "TemperatureCelsius": {
+        "Reading": 39,
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/CPU1Temp"
+    },
+    "PowerWatts": {
+        "Reading": 374,
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/TotalPower"
+    },
+    "PowerLimitWatts": {
+        "SetPoint": 500,
+        "AllowableMax": 1000,
+        "AllowableMin": 150,
+        "ControlMode": "Automatic",
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Controls/PowerLimit"
+    },
+    "FanSpeedsPercent": [
+        {
+            "DeviceName": "Chassis Fan #1",
+            "Reading": 45,
+            "SpeedRPM": 1900,
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/FanBay1"
+        },
+        {
+            "DeviceName": "Chassis Fan #2",
+            "Reading": 55,
+            "SpeedRPM": 2100,
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/FanBay2"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/EnvironmentMetrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Power/index.json b/public-rackmount1/Chassis/1U/Power/index.json
index f394a76..a916e0c 100644
--- a/public-rackmount1/Chassis/1U/Power/index.json
+++ b/public-rackmount1/Chassis/1U/Power/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Power.v1_6_0.Power",
+    "@odata.type": "#Power.v1_7_1.Power",
     "Id": "Power",
     "Name": "Power",
     "PowerControl": [
@@ -138,5 +138,5 @@
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/Chassis/1U/Power",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/Module1/Metrics/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/Module1/Metrics/index.json
new file mode 100644
index 0000000..4c27437
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/Module1/Metrics/index.json
@@ -0,0 +1,64 @@
+{
+    "@odata.type": "#BatteryMetrics.v1_0_1.BatteryMetrics",
+    "Id": "Metrics",
+    "Name": "Metrics for Battery 1",
+    "DischargeCycles": 8.67,
+    "InputVoltage": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/Battery1InputVoltage",
+        "Reading": 12.22
+    },
+    "InputCurrentAmps": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/Battery1InputCurrent",
+        "Reading": 0
+    },
+    "OutputVoltages": [
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/Battery1OutputVoltage",
+            "Reading": 12.22
+        }
+    ],
+    "OutputCurrentAmps": [
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/Battery1OutputCurrent",
+            "Reading": 0
+        }
+    ],
+    "StoredEnergyWattHours": {
+        "Reading": 19.41
+    },
+    "TemperatureCelsius": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/Battery1Temp",
+        "Reading": 33
+    },
+    "ChargePercent": {
+        "Reading": 100
+    },
+    "CellVoltages": [
+        {
+            "Reading": 3.44
+        },
+        {
+            "Reading": 3.45
+        },
+        {
+            "Reading": 3.43
+        },
+        {
+            "Reading": 3.43
+        },
+        {
+            "Reading": 3.45
+        },
+        {
+            "Reading": 3.44
+        },
+        {
+            "Reading": 3.43
+        },
+        {
+            "Reading": 3.44
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/Batteries/Module1/Metrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/Module1/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/Module1/index.json
new file mode 100644
index 0000000..7effe01
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/Module1/index.json
@@ -0,0 +1,47 @@
+{
+    "@odata.type": "#Battery.v1_2_0.Battery",
+    "Id": "Module1",
+    "Name": "Battery 1",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Actions": {
+        "#Battery.SelfTest": {
+            "target": "/redfish/v1/Chassis/1U/PowerSubsystem/Batteries/Module1/Actions/Battery.SelfTest"
+        },
+        "#Battery.Calibrate": {
+            "target": "/redfish/v1/Chassis/1U/PowerSubsystem/Batteries/Module1/Actions/Battery.Calibrate"
+        }
+    },
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "Battery 1",
+            "LocationType": "Bay",
+            "LocationOrdinalValue": 0
+        }
+    },
+    "Model": "RKS-440DC",
+    "Manufacturer": "Contoso Power",
+    "FirmwareVersion": "1.00",
+    "Version": "A05",
+    "ProductionDate": "2019-10-01T06:00:00Z",
+    "SerialNumber": "3488247",
+    "PartNumber": "23456-133",
+    "SparePartNumber": "93284-133",
+    "LocationIndicatorActive": false,
+    "HotPluggable": true,
+    "CapacityRatedWattHours": 20,
+    "CapacityActualWattHours": 19.41,
+    "MaxDischargeRateAmps": 10,
+    "StateOfHealthPercent": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/Battery1StateOfHealth",
+        "Reading": 91
+    },
+    "ChargeState": "Idle",
+    "Metrics": {
+        "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/Batteries/Module1/Metrics"
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/Batteries/Module1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/index.json
new file mode 100644
index 0000000..2e4effb
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/Batteries/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#BatteryCollection.BatteryCollection",
+    "Name": "Battery Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/Batteries/Module1"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/Batteries",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Assembly/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Assembly/index.json
new file mode 100644
index 0000000..86ab76c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Assembly/index.json
@@ -0,0 +1,26 @@
+{
+    "@odata.type": "#Assembly.v1_4_0.Assembly",
+    "Id": "Assembly",
+    "Name": "Power Supply-related Assembly data",
+    "Assemblies": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Assembly#/Assemblies/0",
+            "MemberId": "0",
+            "Name": "Contoso Power Supply",
+            "Model": "345TTT",
+            "PartNumber": "923943",
+            "SparePartNumber": "55-434",
+            "SKU": "55ZZATR",
+            "SerialNumber": "345394834",
+            "Vendor": "Contoso",
+            "ProductionDate": "2017-04-01T14:55:33+03:00",
+            "Producer": "Contoso Supply Co.",
+            "Version": "1.44B",
+            "EngineeringChangeLevel": "9",
+            "BinaryDataURI": "/dumpster/434"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Assembly",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Metrics/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Metrics/index.json
new file mode 100644
index 0000000..99f71ca
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Metrics/index.json
@@ -0,0 +1,91 @@
+{
+    "@odata.type": "#PowerSupplyMetrics.v1_0_1.PowerSupplyMetrics",
+    "Id": "Metrics",
+    "Name": "Metrics for Power Supply 1",
+    "Status": {
+        "State": "Enabled",
+        "Health": "Warning"
+    },
+    "InputVoltage": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1InputVoltage",
+        "Reading": 230.2
+    },
+    "InputCurrentAmps": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1InputCurrent",
+        "Reading": 5.19
+    },
+    "InputPowerWatts": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1InputPower",
+        "Reading": 937.4
+    },
+    "RailVoltage": [
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_3VOutput",
+            "Reading": 3.31
+        },
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_5VOutput",
+            "Reading": 5.03
+        },
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_12VOutput",
+            "Reading": 12.06
+        }
+    ],
+    "RailCurrentAmps": [
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_3VCurrent",
+            "Reading": 9.84
+        },
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_5VCurrent",
+            "Reading": 1.25
+        },
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_12Current",
+            "Reading": 2.58
+        }
+    ],
+    "OutputPowerWatts": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1OutputPower",
+        "Reading": 937.4
+    },
+    "RailPowerWatts": [
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_3VPower",
+            "Reading": 79.84
+        },
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_5VPower",
+            "Reading": 26.25
+        },
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1_12VPower",
+            "Reading": 91.58
+        }
+    ],
+    "EnergykWh": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1Energy",
+        "Reading": 325675
+    },
+    "FrequencyHz": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1InputFrequency",
+        "Reading": 60
+    },
+    "TemperatureCelsius": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1Temp",
+        "Reading": 43.9
+    },
+    "FanSpeedPercent": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/PS1Fan",
+        "Reading": 68,
+        "SpeedRPM": 3290
+    },
+    "Actions": {
+        "#PowerSupplyMetrics.ResetMetrics": {
+            "target": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Metrics/PowerSupplyMetrics.ResetMetrics"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Metrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/index.json
new file mode 100644
index 0000000..5f4ea80
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/index.json
@@ -0,0 +1,88 @@
+{
+    "@odata.type": "#PowerSupply.v1_5_0.PowerSupply",
+    "Id": "Bay1",
+    "Name": "Power Supply Bay 1",
+    "Status": {
+        "State": "Enabled",
+        "Health": "Warning"
+    },
+    "LineInputStatus": "Normal",
+    "Model": "RKS-440DC",
+    "Manufacturer": "Contoso Power",
+    "FirmwareVersion": "1.00",
+    "SerialNumber": "3488247",
+    "PartNumber": "23456-133",
+    "SparePartNumber": "93284-133",
+    "LocationIndicatorActive": false,
+    "HotPluggable": false,
+    "PowerCapacityWatts": 400,
+    "PhaseWiringType": "OnePhase3Wire",
+    "PlugType": "IEC_60320_C14",
+    "InputRanges": [
+        {
+            "NominalVoltageType": "AC200To240V",
+            "CapacityWatts": 400
+        },
+        {
+            "NominalVoltageType": "AC120V",
+            "CapacityWatts": 350
+        },
+        {
+            "NominalVoltageType": "DC380V",
+            "CapacityWatts": 400
+        }
+    ],
+    "EfficiencyRatings": [
+        {
+            "LoadPercent": 25,
+            "EfficiencyPercent": 75
+        },
+        {
+            "LoadPercent": 50,
+            "EfficiencyPercent": 85
+        },
+        {
+            "LoadPercent": 90,
+            "EfficiencyPercent": 80
+        }
+    ],
+    "OutputRails": [
+        {
+            "NominalVoltage": 3.3,
+            "PhysicalContext": "SystemBoard"
+        },
+        {
+            "NominalVoltage": 5,
+            "PhysicalContext": "SystemBoard"
+        },
+        {
+            "NominalVoltage": 12,
+            "PhysicalContext": "StorageDevice"
+        }
+    ],
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "PSU 1",
+            "LocationType": "Bay",
+            "LocationOrdinalValue": 0
+        }
+    },
+    "Links": {
+        "Outlet": {
+            "@odata.id": "https://redfishpdu.contoso.com/redfish/v1/PowerEquipment/RackPDUs/1/Outlets/A4"
+        }
+    },
+    "Assembly": {
+        "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Assembly"
+    },
+    "Metrics": {
+        "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/Metrics"
+    },
+    "Actions": {
+        "#PowerSupply.Reset": {
+            "target": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1/PowerSupply.Reset"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay2/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay2/index.json
new file mode 100644
index 0000000..39c50ec
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay2/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#PowerSupply.v1_5_0.PowerSupply",
+    "Id": "Bay2",
+    "Name": "Power Supply Bay 2",
+    "Status": {
+        "State": "Absent"
+    },
+    "PowerSupplyType": "DC",
+    "HotPluggable": false,
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "PSU 2",
+            "LocationType": "Bay",
+            "LocationOrdinalValue": 1
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/index.json
new file mode 100644
index 0000000..d88eeed
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/PowerSupplies/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#PowerSupplyCollection.PowerSupplyCollection",
+    "Name": "Power Supply Collection",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay2"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/PowerSubsystem/index.json b/public-rackmount1/Chassis/1U/PowerSubsystem/index.json
new file mode 100644
index 0000000..42825b4
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/PowerSubsystem/index.json
@@ -0,0 +1,42 @@
+{
+    "@odata.type": "#PowerSubsystem.v1_1_0.PowerSubsystem",
+    "Id": "PowerSubsystem",
+    "Name": "Power Subsystem for Chassis",
+    "CapacityWatts": 2000,
+    "Allocation": {
+        "RequestedWatts": 1500,
+        "AllocatedWatts": 1200
+    },
+    "PowerSupplyRedundancy": [
+        {
+            "RedundancyType": "Failover",
+            "MaxSupportedInGroup": 2,
+            "MinNeededInGroup": 1,
+            "RedundancyGroup": [
+                {
+                    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay1"
+                },
+                {
+                    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies/Bay2"
+                }
+            ],
+            "Status": {
+                "State": "UnavailableOffline",
+                "Health": "OK"
+            }
+        }
+    ],
+    "PowerSupplies": {
+        "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/PowerSupplies"
+    },
+    "Batteries": {
+        "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem/Batteries"
+    },
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/AmbientTemp/index.json b/public-rackmount1/Chassis/1U/Sensors/AmbientTemp/index.json
new file mode 100644
index 0000000..c0ce1c2
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/AmbientTemp/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "AmbientTemp",
+    "Name": "Ambient Temperature",
+    "Oem": {},
+    "PhysicalContext": "Room",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 22.5,
+    "ReadingUnits": "Cel",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/AmbientTemp",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/Battery1InputCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/Battery1InputCurrent/index.json
new file mode 100644
index 0000000..161f19c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/Battery1InputCurrent/index.json
@@ -0,0 +1,30 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "Battery1InputCurrent",
+    "Name": "Battery #1 Input Current",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ReadingType": "Current",
+    "Reading": 0,
+    "ReadingUnits": "A",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "PhysicalContext": "Battery",
+    "PhysicalSubContext": "Input",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 60,
+            "Activation": "Increasing",
+            "DwellTime": "PT1S"
+        },
+        "UpperCaution": {
+            "Reading": 55,
+            "Activation": "Increasing",
+            "DwellTime": "PT1S"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1InputCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/Battery1InputVoltage/index.json b/public-rackmount1/Chassis/1U/Sensors/Battery1InputVoltage/index.json
new file mode 100644
index 0000000..624c454
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/Battery1InputVoltage/index.json
@@ -0,0 +1,30 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "Battery1InputVoltage",
+    "Name": "Battery #1 Input Voltage",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ReadingType": "Voltage",
+    "Reading": 12.22,
+    "ReadingUnits": "V",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 15,
+    "PhysicalContext": "Battery",
+    "PhysicalSubContext": "Input",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 14,
+            "Activation": "Increasing",
+            "DwellTime": "PT1S"
+        },
+        "UpperCaution": {
+            "Reading": 13,
+            "Activation": "Increasing",
+            "DwellTime": "PT1S"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1InputVoltage",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/Battery1OutputCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/Battery1OutputCurrent/index.json
new file mode 100644
index 0000000..d94e55e
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/Battery1OutputCurrent/index.json
@@ -0,0 +1,30 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "Battery1OutputCurrent",
+    "Name": "Battery #1 Output Current",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ReadingType": "Current",
+    "Reading": 0,
+    "ReadingUnits": "A",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 15,
+    "PhysicalContext": "Battery",
+    "PhysicalSubContext": "Output",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 10,
+            "Activation": "Increasing",
+            "DwellTime": "PT1S"
+        },
+        "UpperCaution": {
+            "Reading": 8,
+            "Activation": "Increasing",
+            "DwellTime": "PT1S"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1OutputCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/Battery1OutputVoltage/index.json b/public-rackmount1/Chassis/1U/Sensors/Battery1OutputVoltage/index.json
new file mode 100644
index 0000000..9956f09
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/Battery1OutputVoltage/index.json
@@ -0,0 +1,30 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "Battery1OutputVoltage",
+    "Name": "Battery #1 Output Voltage",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ReadingType": "Voltage",
+    "Reading": 12.22,
+    "ReadingUnits": "V",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 15,
+    "PhysicalContext": "Battery",
+    "PhysicalSubContext": "Output",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 14,
+            "Activation": "Increasing",
+            "DwellTime": "PT1S"
+        },
+        "UpperCaution": {
+            "Reading": 13,
+            "Activation": "Increasing",
+            "DwellTime": "PT1S"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1OutputVoltage",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/Battery1StateOfHealth/index.json b/public-rackmount1/Chassis/1U/Sensors/Battery1StateOfHealth/index.json
new file mode 100644
index 0000000..1dee4cb
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/Battery1StateOfHealth/index.json
@@ -0,0 +1,24 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "Battery1StateOfHealth",
+    "Name": "Battery #1 State of Health",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ReadingType": "Percent",
+    "Reading": 91,
+    "ReadingUnits": "%",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 100,
+    "PhysicalContext": "Battery",
+    "Thresholds": {
+        "LowerCritical": {
+            "Reading": 30,
+            "Activation": "Decreasing",
+            "DwellTime": "PT1S"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1StateOfHealth",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/Battery1Temp/index.json b/public-rackmount1/Chassis/1U/Sensors/Battery1Temp/index.json
new file mode 100644
index 0000000..04d192c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/Battery1Temp/index.json
@@ -0,0 +1,29 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "Battery1Temp",
+    "Name": "Battery #1 Temperature",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ReadingType": "Temperature",
+    "Reading": 33,
+    "ReadingUnits": "Cel",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "PhysicalContext": "Battery",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 60,
+            "DwellTime": "PT15S",
+            "Activation": "Increasing"
+        },
+        "UpperCaution": {
+            "Reading": 50,
+            "Activation": "Increasing",
+            "DwellTime": "PT15S"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1Temp",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/CPU1Power/index.json b/public-rackmount1/Chassis/1U/Sensors/CPU1Power/index.json
new file mode 100644
index 0000000..77c3b3c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/CPU1Power/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "CPU1Power",
+    "Name": "Power reading for CPU #1",
+    "ReadingType": "Power",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 90,
+    "ReadingUnits": "W",
+    "Implementation": "Reported",
+    "ReadingTime": "2019-08-13T04:14:33+06:00",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 150,
+    "Accuracy": 0.2,
+    "Precision": 1,
+    "SensingInterval": "PT0.01S",
+    "PhysicalContext": "CPU",
+    "Thresholds": {
+        "UpperCriticalUser": {
+            "Reading": 115,
+            "Activation": "Increasing",
+            "DwellTime": "PT0.03S"
+        },
+        "UpperCautionUser": {
+            "Reading": 82,
+            "DwellTime": "PT1S"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/CPU1Power",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/CPU1Temp/index.json b/public-rackmount1/Chassis/1U/Sensors/CPU1Temp/index.json
new file mode 100644
index 0000000..6b6e65c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/CPU1Temp/index.json
@@ -0,0 +1,46 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "CPUTemp1",
+    "Name": "CPU #1 Temperature",
+    "Oem": {},
+    "PhysicalContext": "CPU",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 37,
+    "ReadingUnits": "Cel",
+    "Thresholds": {
+        "UpperCaution": {
+            "Reading": 42,
+            "DwellTime": "PT5M",
+            "Activation": "Increasing"
+        },
+        "UpperCautionUser": {
+            "Reading": 40
+        },
+        "UpperCriticalUser": {
+            "Reading": 45,
+            "DwellTime": "PT1M"
+        },
+        "UpperCritical": {
+            "Reading": 45,
+            "DwellTime": "PT5M",
+            "Activation": "Increasing"
+        },
+        "UpperFatal": {
+            "Reading": 50,
+            "DwellTime": "PT30S",
+            "Activation": "Increasing"
+        }
+    },
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "RelatedItem": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/CPU1Temp",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/CPUFan1/index.json b/public-rackmount1/Chassis/1U/Sensors/CPUFan1/index.json
new file mode 100644
index 0000000..9ba4921
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/CPUFan1/index.json
@@ -0,0 +1,26 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "CPUFan1",
+    "Name": "CPU #1 Fan Speed",
+    "Oem": {},
+    "PhysicalContext": "CPU",
+    "Reading": 80,
+    "ReadingRangeMax": 100,
+    "ReadingRangeMin": 0,
+    "ReadingType": "Percent",
+    "ReadingUnits": "%",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "Thresholds": {
+        "LowerCaution": {
+            "Reading": 5
+        },
+        "LowerCritical": {
+            "Reading": 0
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/CPUFan1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/CPUFan2/index.json b/public-rackmount1/Chassis/1U/Sensors/CPUFan2/index.json
new file mode 100644
index 0000000..a2c1a5b
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/CPUFan2/index.json
@@ -0,0 +1,26 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "CPUFan2",
+    "Name": "CPU #2 Fan Speed",
+    "Oem": {},
+    "PhysicalContext": "CPU",
+    "Reading": 60,
+    "ReadingRangeMax": 100,
+    "ReadingRangeMin": 0,
+    "ReadingType": "Percent",
+    "ReadingUnits": "%",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "Thresholds": {
+        "LowerCaution": {
+            "Reading": 5
+        },
+        "LowerCritical": {
+            "Reading": 0
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/CPUFan2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/DIMM1Temp/index.json b/public-rackmount1/Chassis/1U/Sensors/DIMM1Temp/index.json
new file mode 100644
index 0000000..433bc46
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/DIMM1Temp/index.json
@@ -0,0 +1,46 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "DIMM1Temp",
+    "Name": "DIMM #1 Temperature",
+    "Oem": {},
+    "PhysicalContext": "Memory",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 44,
+    "ReadingUnits": "Cel",
+    "Thresholds": {
+        "UpperCaution": {
+            "Reading": 55,
+            "DwellTime": "PT5M",
+            "Activation": "Increasing"
+        },
+        "UpperCautionUser": {
+            "Reading": 50
+        },
+        "UpperCriticalUser": {
+            "Reading": 60,
+            "DwellTime": "PT1M"
+        },
+        "UpperCritical": {
+            "Reading": 65,
+            "DwellTime": "PT5M",
+            "Activation": "Increasing"
+        },
+        "UpperFatal": {
+            "Reading": 75,
+            "DwellTime": "PT30S",
+            "Activation": "Increasing"
+        }
+    },
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "RelatedItem": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM1"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/DIMM1Temp",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/DIMM2Temp/index.json b/public-rackmount1/Chassis/1U/Sensors/DIMM2Temp/index.json
new file mode 100644
index 0000000..486a61f
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/DIMM2Temp/index.json
@@ -0,0 +1,46 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "DIMM2Temp",
+    "Name": "DIMM #2 Temperature",
+    "Oem": {},
+    "PhysicalContext": "Memory",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 44,
+    "ReadingUnits": "Cel",
+    "Thresholds": {
+        "UpperCaution": {
+            "Reading": 55,
+            "DwellTime": "PT5M",
+            "Activation": "Increasing"
+        },
+        "UpperCautionUser": {
+            "Reading": 50
+        },
+        "UpperCriticalUser": {
+            "Reading": 60,
+            "DwellTime": "PT1M"
+        },
+        "UpperCritical": {
+            "Reading": 65,
+            "DwellTime": "PT5M",
+            "Activation": "Increasing"
+        },
+        "UpperFatal": {
+            "Reading": 75,
+            "DwellTime": "PT30S",
+            "Activation": "Increasing"
+        }
+    },
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "RelatedItem": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM2"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/DIMM2Temp",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/DIMM3Temp/index.json b/public-rackmount1/Chassis/1U/Sensors/DIMM3Temp/index.json
new file mode 100644
index 0000000..06c035d
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/DIMM3Temp/index.json
@@ -0,0 +1,46 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "DIMM3Temp",
+    "Name": "DIMM #3 Temperature",
+    "Oem": {},
+    "PhysicalContext": "Memory",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 44,
+    "ReadingUnits": "Cel",
+    "Thresholds": {
+        "UpperCaution": {
+            "Reading": 55,
+            "DwellTime": "PT5M",
+            "Activation": "Increasing"
+        },
+        "UpperCautionUser": {
+            "Reading": 50
+        },
+        "UpperCriticalUser": {
+            "Reading": 60,
+            "DwellTime": "PT1M"
+        },
+        "UpperCritical": {
+            "Reading": 65,
+            "DwellTime": "PT5M",
+            "Activation": "Increasing"
+        },
+        "UpperFatal": {
+            "Reading": 75,
+            "DwellTime": "PT30S",
+            "Activation": "Increasing"
+        }
+    },
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "RelatedItem": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM3"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/DIMM3Temp",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/ExhaustTemp/index.json b/public-rackmount1/Chassis/1U/Sensors/ExhaustTemp/index.json
new file mode 100644
index 0000000..4c504f7
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/ExhaustTemp/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "ExhaustTemp",
+    "Name": "Fan Bay #1 Exhaust Temperature",
+    "Oem": {},
+    "PhysicalContext": "Exhaust",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 40.5,
+    "ReadingUnits": "Cel",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/ExhaustTemp",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/FanBay1/index.json b/public-rackmount1/Chassis/1U/Sensors/FanBay1/index.json
new file mode 100644
index 0000000..28439c3
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/FanBay1/index.json
@@ -0,0 +1,26 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "FanBay1",
+    "Name": "Chassis Fan #1",
+    "Oem": {},
+    "PhysicalContext": "Chassis",
+    "Reading": 45,
+    "ReadingRangeMax": 100,
+    "ReadingRangeMin": 0,
+    "ReadingType": "Percent",
+    "ReadingUnits": "%",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "Thresholds": {
+        "LowerCaution": {
+            "Reading": 5
+        },
+        "LowerCritical": {
+            "Reading": 0
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/FanBay1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/FanBay2/index.json b/public-rackmount1/Chassis/1U/Sensors/FanBay2/index.json
new file mode 100644
index 0000000..eae72b5
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/FanBay2/index.json
@@ -0,0 +1,26 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "FanBay2",
+    "Name": "Chassis Fan #2",
+    "Oem": {},
+    "PhysicalContext": "Chassis",
+    "Reading": 45,
+    "ReadingRangeMax": 100,
+    "ReadingRangeMin": 0,
+    "ReadingType": "Percent",
+    "ReadingUnits": "%",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "Thresholds": {
+        "LowerCaution": {
+            "Reading": 5
+        },
+        "LowerCritical": {
+            "Reading": 0
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/FanBay2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/IntakeTemp/index.json b/public-rackmount1/Chassis/1U/Sensors/IntakeTemp/index.json
new file mode 100644
index 0000000..6007d13
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/IntakeTemp/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "IntakeTemp",
+    "Name": "Front Panel Intake Temperature",
+    "Oem": {},
+    "PhysicalContext": "Intake",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 24.8,
+    "ReadingUnits": "Cel",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 75,
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/IntakeTemp",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1Energy/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1Energy/index.json
new file mode 100644
index 0000000..cd846f6
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1Energy/index.json
@@ -0,0 +1,22 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1Energy",
+    "Name": "Power Supply #1 Energy",
+    "ReadingType": "EnergykWh",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 7855,
+    "ReadingUnits": "kW.h",
+    "PhysicalContext": "PowerSupply",
+    "Oem": {},
+    "Actions": {
+        "#Sensor.ResetMetrics": {
+            "target": "/redfish/v1/Chassis/1U/Sensors/PS1Energy/Actions/Sensor.ResetMetrics"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Energy",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1Frequency/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1Frequency/index.json
new file mode 100644
index 0000000..b2890d7
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1Frequency/index.json
@@ -0,0 +1,41 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1Frequency",
+    "Name": "Power Supply #1 Frequency",
+    "ReadingType": "Frequency",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 60.1,
+    "ReadingUnits": "Hz",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 160,
+    "Accuracy": 0.02,
+    "Precision": 2,
+    "SensingInterval": "PT0.125S",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Input",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 60.37,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 60.2,
+            "DwellTime": "PT10M"
+        },
+        "LowerCaution": {
+            "Reading": 59.5,
+            "DwellTime": "PT5M"
+        },
+        "LowerCritical": {
+            "Reading": 58.75,
+            "DwellTime": "PT1M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Frequency",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1InputCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1InputCurrent/index.json
new file mode 100644
index 0000000..4c5a5a3
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1InputCurrent/index.json
@@ -0,0 +1,35 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1InputCurrent",
+    "Name": "Power Supply #1 Input Current",
+    "ReadingType": "Current",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 8.92,
+    "ReadingUnits": "A",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 40,
+    "Accuracy": 0.05,
+    "Precision": 2,
+    "SensingInterval": "PT0.1S",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Input",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 10,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 9,
+            "Activation": "Increasing",
+            "DwellTime": "PT10M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1InputCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1InputPower/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1InputPower/index.json
new file mode 100644
index 0000000..36f9bb3
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1InputPower/index.json
@@ -0,0 +1,37 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1InputPower",
+    "Name": "Power Supply #1 Input Power",
+    "ReadingType": "Power",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ElectricalContext": "Total",
+    "Reading": 374,
+    "ReadingUnits": "W",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 500,
+    "ApparentVA": 350,
+    "ReactiveVAR": 29,
+    "PowerFactor": 0.83,
+    "Accuracy": 1,
+    "Precision": 1,
+    "SensingInterval": "PT0.1S",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Input",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 525,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 510,
+            "DwellTime": "PT10M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1InputPower",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1InputVoltage/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1InputVoltage/index.json
new file mode 100644
index 0000000..e99cf59
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1InputVoltage/index.json
@@ -0,0 +1,42 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1InputVoltage",
+    "Name": "Power Supply #1 Input Voltage",
+    "ReadingType": "Voltage",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ElectricalContext": "Total",
+    "Reading": 119.27,
+    "ReadingUnits": "V",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 260,
+    "Accuracy": 0.02,
+    "Precision": 2,
+    "SensingInterval": "PT0.125S",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Input",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 125,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 122,
+            "DwellTime": "PT10M"
+        },
+        "LowerCaution": {
+            "Reading": 118,
+            "DwellTime": "PT5M"
+        },
+        "LowerCritical": {
+            "Reading": 115,
+            "DwellTime": "PT1M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1InputVoltage",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1Out12V/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1Out12V/index.json
new file mode 100644
index 0000000..0daa583
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1Out12V/index.json
@@ -0,0 +1,42 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1Out12V",
+    "Name": "Power Supply #1 12V Output Voltage",
+    "ReadingType": "Voltage",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ElectricalContext": "Total",
+    "Reading": 12.08,
+    "ReadingUnits": "V",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 15,
+    "Accuracy": 0.02,
+    "Precision": 2,
+    "SensingInterval": "PT0.125S",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Output",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 12.5,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 12.35,
+            "DwellTime": "PT10M"
+        },
+        "LowerCaution": {
+            "Reading": 11.85,
+            "DwellTime": "PT5M"
+        },
+        "LowerCritical": {
+            "Reading": 11.5,
+            "DwellTime": "PT1M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out12V",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1Out12VCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1Out12VCurrent/index.json
new file mode 100644
index 0000000..e4731be
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1Out12VCurrent/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1Out12VCurrent",
+    "Name": "Power Supply #1 12V Output Current",
+    "ReadingType": "Current",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 2.79,
+    "ReadingUnits": "A",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 40,
+    "Accuracy": 0.05,
+    "Precision": 2,
+    "SensingInterval": "PT0.1S",
+    "PhysicalContext": "Chassis",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 7,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 6,
+            "Activation": "Increasing",
+            "DwellTime": "PT10M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out12VCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1Out3V/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1Out3V/index.json
new file mode 100644
index 0000000..037820e
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1Out3V/index.json
@@ -0,0 +1,42 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1Out3V",
+    "Name": "Power Supply #1 3V Output Voltage",
+    "ReadingType": "Voltage",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ElectricalContext": "Total",
+    "Reading": 3.32,
+    "ReadingUnits": "V",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 5,
+    "Accuracy": 0.02,
+    "Precision": 2,
+    "SensingInterval": "PT0.125S",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Output",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 3.5,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 3.35,
+            "DwellTime": "PT10M"
+        },
+        "LowerCaution": {
+            "Reading": 3.25,
+            "DwellTime": "PT5M"
+        },
+        "LowerCritical": {
+            "Reading": 3.1,
+            "DwellTime": "PT1M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out3V",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1Out3VCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1Out3VCurrent/index.json
new file mode 100644
index 0000000..7501859
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1Out3VCurrent/index.json
@@ -0,0 +1,35 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1Out3VCurrent",
+    "Name": "Power Supply #1 3V Output Current",
+    "ReadingType": "Current",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 8.92,
+    "ReadingUnits": "A",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 40,
+    "Accuracy": 0.05,
+    "Precision": 2,
+    "SensingInterval": "PT0.1S",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Output",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 25,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 20,
+            "Activation": "Increasing",
+            "DwellTime": "PT10M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out3VCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1Out5V/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1Out5V/index.json
new file mode 100644
index 0000000..0eb26f7
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1Out5V/index.json
@@ -0,0 +1,42 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1Out5V",
+    "Name": "Power Supply #1 5V Output Voltage",
+    "ReadingType": "Voltage",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "ElectricalContext": "Total",
+    "Reading": 5.04,
+    "ReadingUnits": "V",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 10,
+    "Accuracy": 0.02,
+    "Precision": 2,
+    "SensingInterval": "PT0.125S",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Output",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 5.5,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 5.35,
+            "DwellTime": "PT10M"
+        },
+        "LowerCaution": {
+            "Reading": 4.9,
+            "DwellTime": "PT5M"
+        },
+        "LowerCritical": {
+            "Reading": 4.5,
+            "DwellTime": "PT1M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out5V",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS1Out5VCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/PS1Out5VCurrent/index.json
new file mode 100644
index 0000000..108cada
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS1Out5VCurrent/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS1Out5VCurrent",
+    "Name": "Power Supply #1 5V Output Current",
+    "ReadingType": "Current",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 3.41,
+    "ReadingUnits": "A",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 10,
+    "Accuracy": 0.05,
+    "Precision": 2,
+    "SensingInterval": "PT0.1S",
+    "PhysicalContext": "PowerSupply",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 8,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 5,
+            "Activation": "Increasing",
+            "DwellTime": "PT10M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out5VCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2Energy/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2Energy/index.json
new file mode 100644
index 0000000..dc5d388
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2Energy/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2Energy",
+    "Name": "Power Supply #2 Energy",
+    "ReadingType": "EnergykWh",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Absent"
+    },
+    "PhysicalContext": "PowerSupply",
+    "Oem": {},
+    "Actions": {
+        "#Sensor.ResetMetrics": {
+            "target": "/redfish/v1/Chassis/1U/Sensors/PS2Energy/Actions/Sensor.ResetMetrics"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Energy",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2Frequency/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2Frequency/index.json
new file mode 100644
index 0000000..cb5da68
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2Frequency/index.json
@@ -0,0 +1,14 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2Frequency",
+    "Name": "Power Supply #2 Frequency",
+    "ReadingType": "Frequency",
+    "Status": {
+        "State": "Absent"
+    },
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Input",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Frequency",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2InputCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2InputCurrent/index.json
new file mode 100644
index 0000000..8d7e21c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2InputCurrent/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2InputCurrent",
+    "Name": "Power Supply #2 Input Current",
+    "ReadingType": "Current",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Absent"
+    },
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Input",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2InputCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2InputPower/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2InputPower/index.json
new file mode 100644
index 0000000..da5e05c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2InputPower/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2InputPower",
+    "Name": "Power Supply #2 Input Power",
+    "ReadingType": "Power",
+    "Status": {
+        "State": "Absent"
+    },
+    "ElectricalContext": "Total",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Input",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2InputPower",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2InputVoltage/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2InputVoltage/index.json
new file mode 100644
index 0000000..430642d
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2InputVoltage/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2InputVoltage",
+    "Name": "Power Supply #2 Input Voltage",
+    "ReadingType": "Voltage",
+    "Status": {
+        "State": "Absent"
+    },
+    "ElectricalContext": "Total",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Input",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2InputVoltage",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2Out12V/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2Out12V/index.json
new file mode 100644
index 0000000..99a93aa
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2Out12V/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2Out12V",
+    "Name": "Power Supply #2 12V Output Voltage",
+    "ReadingType": "Voltage",
+    "Status": {
+        "State": "Absent"
+    },
+    "ElectricalContext": "Total",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Output",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out12V",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2Out12VCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2Out12VCurrent/index.json
new file mode 100644
index 0000000..40b668c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2Out12VCurrent/index.json
@@ -0,0 +1,14 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2Out12VCurrent",
+    "Name": "Power Supply #2 12V Output Current",
+    "ReadingType": "Current",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Absent"
+    },
+    "PhysicalContext": "PowerSupply",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out12VCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2Out3V/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2Out3V/index.json
new file mode 100644
index 0000000..ea35942
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2Out3V/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2Out3V",
+    "Name": "Power Supply #2 3V Output Voltage",
+    "ReadingType": "Voltage",
+    "Status": {
+        "State": "Absent"
+    },
+    "ElectricalContext": "Total",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Output",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out3V",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2Out3VCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2Out3VCurrent/index.json
new file mode 100644
index 0000000..68a401f
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2Out3VCurrent/index.json
@@ -0,0 +1,14 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2Out3VCurrent",
+    "Name": "Power Supply #2 3V Output Current",
+    "ReadingType": "Current",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Absent"
+    },
+    "PhysicalContext": "PowerSupply",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out3VCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2Out5V/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2Out5V/index.json
new file mode 100644
index 0000000..862004c
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2Out5V/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2Out5V",
+    "Name": "Power Supply #2 5V Output Voltage",
+    "ReadingType": "Voltage",
+    "Status": {
+        "State": "Absent"
+    },
+    "ElectricalContext": "Total",
+    "PhysicalContext": "PowerSupply",
+    "PhysicalSubContext": "Output",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out5V",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/PS2Out5VCurrent/index.json b/public-rackmount1/Chassis/1U/Sensors/PS2Out5VCurrent/index.json
new file mode 100644
index 0000000..a0ba3f3
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/PS2Out5VCurrent/index.json
@@ -0,0 +1,14 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "PS2Out5VCurrent",
+    "Name": "Power Supply #2 5V Output Current",
+    "ReadingType": "Current",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Absent"
+    },
+    "PhysicalContext": "PowerSupply",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out5VCurrent",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/TotalEnergy/index.json b/public-rackmount1/Chassis/1U/Sensors/TotalEnergy/index.json
new file mode 100644
index 0000000..93926ef
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/TotalEnergy/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "TotalEnergy",
+    "Name": "Total Energy",
+    "ReadingType": "EnergykWh",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 325675,
+    "ReadingUnits": "kW.h",
+    "PhysicalContext": "Chassis",
+    "Oem": {},
+    "Actions": {
+        "#Sensor.ResetMetrics": {
+            "target": "/redfish/v1/Chassis/1U/Sensors/TotalEnergy/Actions/Sensor.ResetMetrics"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/TotalEnergy",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/TotalPower/index.json b/public-rackmount1/Chassis/1U/Sensors/TotalPower/index.json
new file mode 100644
index 0000000..244947d
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/TotalPower/index.json
@@ -0,0 +1,38 @@
+{
+    "@odata.type": "#Sensor.v1_6_0.Sensor",
+    "Id": "TotalPower",
+    "Name": "Power reading for the Chassis",
+    "ReadingType": "Power",
+    "ElectricalContext": "Total",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Reading": 374,
+    "ReadingUnits": "W",
+    "Implementation": "Synthesized",
+    "ReadingTime": "2019-08-13T04:14:33+06:00",
+    "ReadingRangeMin": 0,
+    "ReadingRangeMax": 600,
+    "ApparentVA": 2749.2,
+    "ReactiveVAR": 281.4,
+    "PowerFactor": 0.99,
+    "Accuracy": 0.2,
+    "Precision": 1,
+    "SensingInterval": "PT0.25S",
+    "PhysicalContext": "Chassis",
+    "Thresholds": {
+        "UpperCritical": {
+            "Reading": 600,
+            "Activation": "Increasing",
+            "DwellTime": "PT1M"
+        },
+        "UpperCaution": {
+            "Reading": 580,
+            "DwellTime": "PT10M"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors/TotalPower",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Sensors/index.json b/public-rackmount1/Chassis/1U/Sensors/index.json
new file mode 100644
index 0000000..44a0822
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/Sensors/index.json
@@ -0,0 +1,132 @@
+{
+    "@odata.type": "#SensorCollection.SensorCollection",
+    "Name": "Chassis sensors",
+    "Members@odata.count": 41,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/AmbientTemp"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/CPUFan1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/CPUFan2"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/CPU1Temp"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/DIMM1Temp"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/DIMM2Temp"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/DIMM3Temp"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/ExhaustTemp"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/FanBay1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/FanBay2"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/IntakeTemp"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Energy"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Frequency"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1InputCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1InputPower"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1InputVoltage"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out12V"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out12VCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out3V"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out3VCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out5V"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS1Out5VCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Energy"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Frequency"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2InputCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2InputPower"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2InputVoltage"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out12V"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out12VCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out3V"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out3VCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out5V"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/PS2Out5VCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/TotalEnergy"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/TotalPower"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1Temp"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1InputVoltage"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1InputCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1OutputVoltage"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1OutputCurrent"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/Sensors/Battery1StateOfHealth"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/Sensors",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/Thermal/index.json b/public-rackmount1/Chassis/1U/Thermal/index.json
index 8ae71e9..da5391b 100644
--- a/public-rackmount1/Chassis/1U/Thermal/index.json
+++ b/public-rackmount1/Chassis/1U/Thermal/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Thermal.v1_6_0.Thermal",
+    "@odata.type": "#Thermal.v1_7_1.Thermal",
     "Id": "Thermal",
     "Name": "Thermal",
     "Temperatures": [
@@ -155,5 +155,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Chassis/1U/Thermal",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/Bay1/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/Bay1/index.json
new file mode 100644
index 0000000..8f81b54
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/Bay1/index.json
@@ -0,0 +1,30 @@
+{
+    "@odata.type": "#Fan.v1_3_0.Fan",
+    "Id": "Bay1",
+    "Name": "Fan Bay 1",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PhysicalContext": "Chassis",
+    "Model": "RKS-440DC",
+    "Manufacturer": "Contoso Fans",
+    "PartNumber": "23456-133",
+    "SparePartNumber": "93284-133",
+    "LocationIndicatorActive": true,
+    "HotPluggable": true,
+    "SpeedPercent": {
+        "Reading": 45,
+        "SpeedRPM": 2200,
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/FanBay1"
+    },
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "Chassis Fan Bay 1",
+            "LocationType": "Bay",
+            "LocationOrdinalValue": 0
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/Bay1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/Bay2/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/Bay2/index.json
new file mode 100644
index 0000000..118ee68
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/Bay2/index.json
@@ -0,0 +1,30 @@
+{
+    "@odata.type": "#Fan.v1_3_0.Fan",
+    "Id": "Bay2",
+    "Name": "Fan Bay 2",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PhysicalContext": "Chassis",
+    "Model": "RKS-440DC",
+    "Manufacturer": "Contoso Fans",
+    "PartNumber": "23456-133",
+    "SparePartNumber": "93284-133",
+    "LocationIndicatorActive": false,
+    "HotPluggable": true,
+    "SpeedPercent": {
+        "Reading": 45,
+        "SpeedRPM": 2400,
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/FanBay2"
+    },
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "Chassis Fan Bay 2",
+            "LocationType": "Bay",
+            "LocationOrdinalValue": 1
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/Bay2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/CPU1/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/CPU1/index.json
new file mode 100644
index 0000000..10cf328
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/CPU1/index.json
@@ -0,0 +1,29 @@
+{
+    "@odata.type": "#Fan.v1_3_0.Fan",
+    "Id": "CPU1",
+    "Name": "Fan for CPU 1",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PhysicalContext": "CPU",
+    "Model": "RKS-440DC",
+    "Manufacturer": "Contoso Fans",
+    "PartNumber": "23456-133",
+    "SparePartNumber": "93284-133",
+    "LocationIndicatorActive": false,
+    "HotPluggable": false,
+    "SpeedPercent": {
+        "Reading": 45,
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/CPUFan1"
+    },
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "CPU #1 Fan",
+            "LocationType": "Bay",
+            "LocationOrdinalValue": 0
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/CPU1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/CPU2/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/CPU2/index.json
new file mode 100644
index 0000000..372d70b
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/CPU2/index.json
@@ -0,0 +1,30 @@
+{
+    "@odata.type": "#Fan.v1_3_0.Fan",
+    "Id": "CPU2",
+    "Name": "Fan for CPU 2",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PhysicalContext": "CPU",
+    "Model": "RKS-440DC",
+    "Manufacturer": "Contoso Fans",
+    "PartNumber": "23456-133",
+    "SparePartNumber": "93284-133",
+    "LocationIndicatorActive": false,
+    "HotPluggable": false,
+    "SpeedPercent": {
+        "Reading": 45,
+        "SpeedRPM": 1490,
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/CPUFan2"
+    },
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "CPU #2 Fan",
+            "LocationType": "Bay",
+            "LocationOrdinalValue": 1
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/CPU2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/index.json
new file mode 100644
index 0000000..859e54e
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/Fans/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.type": "#FanCollection.FanCollection",
+    "Name": "Fan Club",
+    "Members@odata.count": 4,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/Bay1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/Bay2"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/CPU1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/CPU2"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/Metrics/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/Metrics/index.json
new file mode 100644
index 0000000..fe786b7
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/Metrics/index.json
@@ -0,0 +1,24 @@
+{
+    "@odata.type": "#HeaterMetrics.v1_0_0.HeaterMetrics",
+    "Id": "HeaterMetrics",
+    "Description": "Heater Metrics for CPU1 Heater",
+    "Name": "CPU1 Heater Metrics",
+    "PrePowerOnHeatingTimeSeconds": 600,
+    "RuntimeHeatingTimeSeconds": 3600,
+    "PowerWatts": {
+        "Reading": 200.3
+    },
+    "TemperatureReadingsCelsius": [
+        {
+            "DeviceName": "Heater Average Temperature",
+            "Reading": 2.5
+        }
+    ],
+    "Actions": {
+        "#HeaterMetrics.ResetMetrics": {
+            "target": "/redfish/v1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/Metrics/HeaterMetrics.ResetMetrics"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/Metrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/index.json
new file mode 100644
index 0000000..0cf9518
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/index.json
@@ -0,0 +1,30 @@
+{
+    "@odata.type": "#Heater.v1_0_0.Heater",
+    "Id": "CPU1Heater",
+    "Description": "Heater for CPU1",
+    "Name": "Heater 1",
+    "PhysicalContext": "CPU",
+    "Manufacturer": "Contoso Heaters",
+    "Model": "CPUHeater",
+    "SerialNumber": "SNDHM0123456789",
+    "PartNumber": "12345-123",
+    "SparePartNumber": "54321-321",
+    "LocationIndicatorActive": false,
+    "HotPluggable": true,
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "Links": {
+        "Processors": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1"
+            }
+        ]
+    },
+    "Metrics": {
+        "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater/Metrics"
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/index.json
new file mode 100644
index 0000000..e655a4e
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/Heaters/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#HeaterCollection.HeaterCollection",
+    "Name": "Heater Collection",
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Heaters/CPU1Heater"
+        }
+    ],
+    "Members@odata.count": 1,
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Heaters",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/ThermalMetrics/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/ThermalMetrics/index.json
new file mode 100644
index 0000000..17a764a
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/ThermalMetrics/index.json
@@ -0,0 +1,38 @@
+{
+    "@odata.type": "#ThermalMetrics.v1_1_0.ThermalMetrics",
+    "Id": "ThermalMetrics",
+    "Name": "Chassis Thermal Metrics",
+    "TemperatureSummaryCelsius": {
+        "Internal": {
+            "Reading": 39,
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/CPU1Temp"
+        },
+        "Intake": {
+            "Reading": 24.8,
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/IntakeTemp"
+        },
+        "Ambient": {
+            "Reading": 22.5,
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/AmbientTemp"
+        },
+        "Exhaust": {
+            "Reading": 40.5,
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/ExhaustTemp"
+        }
+    },
+    "TemperatureReadingsCelsius": [
+        {
+            "Reading": 24.8,
+            "DeviceName": "Intake",
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/IntakeTemp"
+        },
+        {
+            "Reading": 40.5,
+            "DeviceName": "Exhaust",
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/ExhaustTemp"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/ThermalMetrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/ThermalSubsystem/index.json b/public-rackmount1/Chassis/1U/ThermalSubsystem/index.json
new file mode 100644
index 0000000..3910601
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/ThermalSubsystem/index.json
@@ -0,0 +1,56 @@
+{
+    "@odata.type": "#ThermalSubsystem.v1_1_0.ThermalSubsystem",
+    "Id": "ThermalSubsystem",
+    "Name": "Thermal Subsystem for Chassis",
+    "FanRedundancy": [
+        {
+            "RedundancyType": "NPlusM",
+            "MaxSupportedInGroup": 2,
+            "MinNeededInGroup": 1,
+            "RedundancyGroup": [
+                {
+                    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/Bay1"
+                },
+                {
+                    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/Bay2"
+                }
+            ],
+            "Status": {
+                "State": "Enabled",
+                "Health": "OK"
+            }
+        },
+        {
+            "RedundancyType": "NPlusM",
+            "MaxSupportedInGroup": 2,
+            "MinNeededInGroup": 1,
+            "RedundancyGroup": [
+                {
+                    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/CPU1"
+                },
+                {
+                    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans/CPU2"
+                }
+            ],
+            "Status": {
+                "State": "Disabled"
+            }
+        }
+    ],
+    "Fans": {
+        "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Fans"
+    },
+    "ThermalMetrics": {
+        "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/ThermalMetrics"
+    },
+    "Heaters": {
+        "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem/Heaters"
+    },
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/DeviceCert/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/DeviceCert/index.json
new file mode 100644
index 0000000..763cce5
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/DeviceCert/index.json
@@ -0,0 +1,20 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "DeviceCert",
+    "Name": "SPDM Device Certificate",
+    "CertificateType": "PEM",
+    "Links": {
+        "Issuer": {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates/contoso-subca"
+        }
+    },
+    "CertificateUsageTypes": [
+        "Device"
+    ],
+    "SPDM": {
+        "SlotId": 0
+    },
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDvzCCAqegAwIBAgIBATANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UEBhMCVVMx\nEDAOBgNVBAgMB1JlZGZpc2gxHDAaBgNVBAcME1NvbWV3aGVyZSBJbmJldHdlZW4x\nEDAOBgNVBAoMB0NvbnRvc28xEDAOBgNVBAsMB01vY2t1cHMxHTAbBgNVBAMMFENl\ncnRpZmljYXRlIERpdmlzaW9uMCAXDTIxMTAwNzIwMzExOFoYDzIwOTkxMDA4MjAz\nMTE4WjBnMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHUmVkZmlzaDEQMA4GA1UECgwH\nQ29udG9zbzEZMBcGA1UECwwQU3RvcmFnZSBCdXNpbmVzczEZMBcGA1UEAwwQU3Rv\ncmFnZSBQcm9kdWN0czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJrI\nfABOA7LBs9eLmWvNqwaZEKHXksvfF7YLqkamROep4AAAdLmLI39yQCmQVdNkHVXf\nMHofF7d+ej8EPil3ORT2Y/Yv3+Cc4ZtvDCOTNyJUD8IRa/O7UcGNrCY/Pv0ZHRca\nG+prcaHibpm7YVW5wNFyZ+Rt9pV5KUQ1hJPtdPZEPkfMF1s6SoYkRQwtXXDVuG3G\nPYSBMiFa51rf0H3EtHWxjTjkp6MKi5maqBiaOOVoYbuWeh1DzgAMs48++8KGDI2T\nkPynhl21gCuLzEUgAI5akGXmlgJ6FrxOXvSCCoD7ghk786CKg933FcYoiwNy167u\nyfMDzrgGugLZXcHDr/sCAwEAAaNaMFgwHQYDVR0OBBYEFK9kV2zMi8Y3xB+1No9K\nyX5+Gqc8MB8GA1UdIwQYMBaAFPzQI/w1tukTiYkEcfcbxMIQyTcWMAkGA1UdEwQC\nMAAwCwYDVR0PBAQDAgWgMA0GCSqGSIb3DQEBDQUAA4IBAQBTWhkRvj2nFP6Pvttk\nqbYwCawCMqn0W//pJ/eVZpYx3OT5315VacMrhUDwePZbJXOKNhuuEiymQxM4iHd0\nfh6Bq7ykonZAYWuYNt1KRA98QI1lZh42TvcZ43HaWkao/R9OoR8uiICGjIGRV987\nAATMKsuZkA3rB06XdNlSlHGehwSZAOPguVG5QWOUE9qA9p1Uu6cot1h4jXYhO/vV\nr1/9zwS01fRnc77lMOTOsBloy+OUj8ibY+BzCXOjhAZfvv0hLszWMAUGfktMGcWc\n3gprFHocW18ReuosiZyffDvxJfo5HQfZM429tTxA7ixozI2F0MRDSFuQ/OATDJpu\npzcr\n-----END CERTIFICATE-----\n",
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/DeviceCert",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/index.json
new file mode 100644
index 0000000..60f7b98
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "AC-RoT0 Certificates Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/DeviceCert"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/index.json
new file mode 100644
index 0000000..551921b
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/AC-RoT0/index.json
@@ -0,0 +1,31 @@
+{
+    "@odata.type": "#TrustedComponent.v1_0_0.TrustedComponent",
+    "Id": "AC-RoT0",
+    "UUID": "A3981CF9-576A-4335-A19F-B8CD7EC2821D",
+    "Description": "Root of trust chip for CPU1",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "TrustedComponentType": "Discrete",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates"
+    },
+    "Links": {
+        "ComponentsProtected": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1"
+            }
+        ],
+        "ComponentIntegrity": [
+            {
+                "@odata.id": "/redfish/v1/ComponentIntegrity/SS-SPDM-0"
+            }
+        ],
+        "ActiveSoftwareImage": {
+            "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/AC-RoT0"
+        }
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/TPM/Certificates/EKCert/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/TPM/Certificates/EKCert/index.json
new file mode 100644
index 0000000..93f6b66
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/TPM/Certificates/EKCert/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "EKCert",
+    "Name": "EKCert of the TPM of the computer system",
+    "CertificateType": "PEM",
+    "Links": {
+        "Issuer": {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates/contoso-subca"
+        }
+    },
+    "CertificateUsageTypes": [
+        "Device"
+    ],
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDejCCAmICAQIwDQYJKoZIhvcNAQENBQAwgYAxCzAJBgNVBAYTAlVTMRAwDgYD\nVQQIDAdSZWRmaXNoMRwwGgYDVQQHDBNTb21ld2hlcmUgSW5iZXR3ZWVuMRAwDgYD\nVQQKDAdDb250b3NvMRAwDgYDVQQLDAdNb2NrdXBzMR0wGwYDVQQDDBRDZXJ0aWZp\nY2F0ZSBEaXZpc2lvbjAgFw0yMTEwMDcyMzQxNTNaGA8yMDk5MTAwODIzNDE1M1ow\ngYIxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdSZWRmaXNoMR8wHQYDVQQHDBZFdmVy\neXdoZXJlIGFuZCBub3doZXJlMRAwDgYDVQQKDAdDb250b3NvMRYwFAYDVQQLDA1U\nUE0gU29sdXRpb25zMRYwFAYDVQQDDA1EaXNjcmV0ZSBUUE1zMIIBIjANBgkqhkiG\n9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuVZyaRkASJBM9TuAYReCBLGB2NAF1moUBn0q\nH8mUOpO/Iv6Qm1EpAx398L85K/5KwQf0WwNY6wmzAdwJ5aKftnm92krEC0VnXytb\nYQC8D7b/f/Dw2NMWsTwE+NBsoRdj7Cz1pGRMYEJv7BG4t8VXRXe5UiZ9QHCLzMbT\n6y/T32WKCR/9XWtxWjaoqQEIsyGyQfrmYq2i/mAAcSrtFSAntJUwymEBGI9CKBqy\n2V/Ih0YQ3FwItt6mJNwba8fZ8aSXAEmTlIo8pX71eN9pQOnhSDce62naXqfEgz7I\ncW3Z9Ll6j2omYuOdu3EXylIAU/+Hdn31PoV7KOOsA2U9E/P5PwIDAQABMA0GCSqG\nSIb3DQEBDQUAA4IBAQCG4m5j1LUgC18gFDUztShcEmjyxhJ8QuEbDcVHT6UowhST\n/TDAhwgGSAa2kNCefayG/EEur6s7SJ5Qryx97637iz9Icv4uq+Dg6w4vlpCB2E7j\nT2/liiRq0CSOIQ8bpfot+skp68kFPyw+hgLyci2tjYV3FGkZmsfKCV58hh+jkNr+\nIQHpyF/FEd96edWrUqsau6rIBzFk6EsdTncYTcMyVXjAQWva1u1Xygy7CvR2IEae\nBEN7S34RKluP+UKuB56Wi7b2BZQmLCfGbEUVaN3UyjNwZf2BqYT7yjm+B7D6ncvJ\nMoKeFJfWNY1KzDF7HwhHSVfJAKLRimplM2f/ImBZ\n-----END CERTIFICATE-----\n",
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/TPM/Certificates/EKCert",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/TPM/Certificates/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/TPM/Certificates/index.json
new file mode 100644
index 0000000..11ae36e
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/TPM/Certificates/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "TPM Certificates Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/TPM/Certificates/EKCert"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/TPM/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/TPM/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/TPM/index.json
new file mode 100644
index 0000000..ce97fc8
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/TPM/index.json
@@ -0,0 +1,28 @@
+{
+    "@odata.type": "#TrustedComponent.v1_0_0.TrustedComponent",
+    "Id": "TPM",
+    "UUID": "D0810BE9-EB91-4CE2-BADE-42B42326700C",
+    "Description": "TPM for computer system",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "TrustedComponentType": "Discrete",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/TPM/Certificates"
+    },
+    "Links": {
+        "ComponentsProtected": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2"
+            }
+        ],
+        "ComponentIntegrity": [
+            {
+                "@odata.id": "/redfish/v1/ComponentIntegrity/TPM-0"
+            }
+        ]
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/TPM",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/Certificates/DeviceCert/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/Certificates/DeviceCert/index.json
new file mode 100644
index 0000000..15f902e
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/Certificates/DeviceCert/index.json
@@ -0,0 +1,20 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "DeviceCert",
+    "Name": "SPDM Device Certificate",
+    "CertificateType": "PEM",
+    "Links": {
+        "Issuer": {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates/contoso-subca"
+        }
+    },
+    "CertificateUsageTypes": [
+        "Device"
+    ],
+    "SPDM": {
+        "SlotId": 0
+    },
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDvzCCAqegAwIBAgIBATANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UEBhMCVVMx\nEDAOBgNVBAgMB1JlZGZpc2gxHDAaBgNVBAcME1NvbWV3aGVyZSBJbmJldHdlZW4x\nEDAOBgNVBAoMB0NvbnRvc28xEDAOBgNVBAsMB01vY2t1cHMxHTAbBgNVBAMMFENl\ncnRpZmljYXRlIERpdmlzaW9uMCAXDTIxMTAwNzIwMzExOFoYDzIwOTkxMDA4MjAz\nMTE4WjBnMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHUmVkZmlzaDEQMA4GA1UECgwH\nQ29udG9zbzEZMBcGA1UECwwQU3RvcmFnZSBCdXNpbmVzczEZMBcGA1UEAwwQU3Rv\ncmFnZSBQcm9kdWN0czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJrI\nfABOA7LBs9eLmWvNqwaZEKHXksvfF7YLqkamROep4AAAdLmLI39yQCmQVdNkHVXf\nMHofF7d+ej8EPil3ORT2Y/Yv3+Cc4ZtvDCOTNyJUD8IRa/O7UcGNrCY/Pv0ZHRca\nG+prcaHibpm7YVW5wNFyZ+Rt9pV5KUQ1hJPtdPZEPkfMF1s6SoYkRQwtXXDVuG3G\nPYSBMiFa51rf0H3EtHWxjTjkp6MKi5maqBiaOOVoYbuWeh1DzgAMs48++8KGDI2T\nkPynhl21gCuLzEUgAI5akGXmlgJ6FrxOXvSCCoD7ghk786CKg933FcYoiwNy167u\nyfMDzrgGugLZXcHDr/sCAwEAAaNaMFgwHQYDVR0OBBYEFK9kV2zMi8Y3xB+1No9K\nyX5+Gqc8MB8GA1UdIwQYMBaAFPzQI/w1tukTiYkEcfcbxMIQyTcWMAkGA1UdEwQC\nMAAwCwYDVR0PBAQDAgWgMA0GCSqGSIb3DQEBDQUAA4IBAQBTWhkRvj2nFP6Pvttk\nqbYwCawCMqn0W//pJ/eVZpYx3OT5315VacMrhUDwePZbJXOKNhuuEiymQxM4iHd0\nfh6Bq7ykonZAYWuYNt1KRA98QI1lZh42TvcZ43HaWkao/R9OoR8uiICGjIGRV987\nAATMKsuZkA3rB06XdNlSlHGehwSZAOPguVG5QWOUE9qA9p1Uu6cot1h4jXYhO/vV\nr1/9zwS01fRnc77lMOTOsBloy+OUj8ibY+BzCXOjhAZfvv0hLszWMAUGfktMGcWc\n3gprFHocW18ReuosiZyffDvxJfo5HQfZM429tTxA7ixozI2F0MRDSFuQ/OATDJpu\npzcr\n-----END CERTIFICATE-----\n",
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/iRoT0/Certificates/DeviceCert",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/Certificates/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/Certificates/index.json
new file mode 100644
index 0000000..f7b0262
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/Certificates/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "iRoT0 Certificates Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/iRoT0/Certificates/DeviceCert"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/iRoT0/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/index.json
new file mode 100644
index 0000000..af32107
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/iRoT0/index.json
@@ -0,0 +1,31 @@
+{
+    "@odata.type": "#TrustedComponent.v1_0_0.TrustedComponent",
+    "Id": "iRoT0",
+    "UUID": "A3981CF9-576A-4335-A19F-B8CD7EC2821E",
+    "Description": "Integrated Root of trust chip for CPU1",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "TrustedComponentType": "Integrated",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/iRoT0/Certificates"
+    },
+    "Links": {
+        "ComponentsProtected": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1"
+            }
+        ],
+        "IntegratedInto": {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1"
+        },
+        "ComponentIntegrity": [
+            {
+                "@odata.id": "/redfish/v1/ComponentIntegrity/SS-SPDM-1"
+            }
+        ]
+    },
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/iRoT0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/TrustedComponents/index.json b/public-rackmount1/Chassis/1U/TrustedComponents/index.json
new file mode 100644
index 0000000..efd3568
--- /dev/null
+++ b/public-rackmount1/Chassis/1U/TrustedComponents/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#TrustedComponentCollection.TrustedComponentCollection",
+    "Name": "Trusted Component Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/iRoT0"
+        },
+        {
+            "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/TPM"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/1U/index.json b/public-rackmount1/Chassis/1U/index.json
index a1202f5..3e4f1ea 100644
--- a/public-rackmount1/Chassis/1U/index.json
+++ b/public-rackmount1/Chassis/1U/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Chassis.v1_11_0.Chassis",
+    "@odata.type": "#Chassis.v1_22_0.Chassis",
     "Id": "1U",
     "Name": "Computer System Chassis",
     "ChassisType": "RackMount",
@@ -36,9 +36,29 @@
         "State": "Enabled",
         "Health": "OK"
     },
+    "ThermalSubsystem": {
+        "@odata.id": "/redfish/v1/Chassis/1U/ThermalSubsystem"
+    },
+    "PowerSubsystem": {
+        "@odata.id": "/redfish/v1/Chassis/1U/PowerSubsystem"
+    },
+    "EnvironmentMetrics": {
+        "@odata.id": "/redfish/v1/Chassis/1U/EnvironmentMetrics"
+    },
+    "Sensors": {
+        "@odata.id": "/redfish/v1/Chassis/1U/Sensors"
+    },
+    "Controls": {
+        "@odata.id": "/redfish/v1/Chassis/1U/Controls"
+    },
+    "TrustedComponents": {
+        "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents"
+    },
+    "Thermal@Redfish.Deprecated": "Please migrate to use /redfish/v1/Chassis/1U/ThermalSubsystem",
     "Thermal": {
         "@odata.id": "/redfish/v1/Chassis/1U/Thermal"
     },
+    "Power@Redfish.Deprecated": "Please migrate to use /redfish/v1/Chassis/1U/PowerSubsystem",
     "Power": {
         "@odata.id": "/redfish/v1/Chassis/1U/Power"
     },
@@ -60,5 +80,5 @@
         ]
     },
     "@odata.id": "/redfish/v1/Chassis/1U",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Chassis/index.json b/public-rackmount1/Chassis/index.json
index c46757a..cef20b7 100644
--- a/public-rackmount1/Chassis/index.json
+++ b/public-rackmount1/Chassis/index.json
@@ -8,5 +8,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Chassis",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/ComponentIntegrity/SS-SPDM-0/index.json b/public-rackmount1/ComponentIntegrity/SS-SPDM-0/index.json
new file mode 100644
index 0000000..4f075fb
--- /dev/null
+++ b/public-rackmount1/ComponentIntegrity/SS-SPDM-0/index.json
@@ -0,0 +1,70 @@
+{
+    "@odata.type": "#ComponentIntegrity.v1_2_0.ComponentIntegrity",
+    "Id": "SS-SPDM-0",
+    "Description": "SPDM Integrity Information for CPU1 reported by AC-RoT0",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "ComponentIntegrityType": "SPDM",
+    "ComponentIntegrityTypeVersion": "1.1.0",
+    "ComponentIntegrityEnabled": true,
+    "TargetComponentURI": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0",
+    "LastUpdated": "2021-11-02T14:05:39-07:00",
+    "SPDM": {
+        "Requester": {
+            "@odata.id": "/redfish/v1/Managers/BMC"
+        },
+        "MeasurementSet": {
+            "MeasurementSpecification": "DMTF",
+            "MeasurementSummary": "oylHo8JAT1RqtB0Vlx9dCzogavikhSvIZpVEDhI1X1+TKeyZZvwuUb5qF9uWqPVa",
+            "MeasurementSummaryHashAlgorithm": "TPM_ALG_SHA_384",
+            "MeasurementSummaryType": "TCB",
+            "Measurements": [
+                {
+                    "MeasurementIndex": 1,
+                    "PartofSummaryHash": false,
+                    "LastUpdated": "2021-10-31T19:08:02-07:00",
+                    "Measurement": "K0zqzG/MFbeV7OVAhvDugxEzc7nMnRvdoKy8g2zU5JovPrUNSeFJxibTZE+0kOR9QhDR5RzumnomFECF8zI/Lw==",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA_512"
+                },
+                {
+                    "MeasurementIndex": 3,
+                    "PartofSummaryHash": true,
+                    "LastUpdated": "2021-10-31T19:08:02-07:00",
+                    "Measurement": "4wEF1nnub2ozuYTWyjyvFGrYnSn0eidy54uaIYXjp/HKRByaco9UtCZeyNfA3rQ3YsRD/6csLcqGw9Nd9/HPAw==",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA_512",
+                    "MeasurmentType": "ImmutableROM"
+                },
+                {
+                    "MeasurementIndex": 150,
+                    "PartofSummaryHash": true,
+                    "LastUpdated": "2021-10-31T19:08:02-07:00",
+                    "Measurement": "dZyksxnM/LZbSUY8INpp4wqcCM8m6XOKoy8cLaXOjUzqYYJT92AmEp7hKVFULNz1aCpKk69VULMyaDIv9hmJSQ==",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA_512"
+                }
+            ]
+        },
+        "IdentityAuthentication": {
+            "ResponderAuthentication": {
+                "ComponentCertificate": {
+                    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/DeviceCert"
+                }
+            }
+        },
+        "ComponentCommunication": {
+            "Sessions": [
+                {
+                    "SessionId": 15999129,
+                    "SessionType": "EncryptedAuthenticated"
+                },
+                {
+                    "SessionId": 1193013,
+                    "SessionType": "EncryptedAuthenticated"
+                }
+            ]
+        }
+    },
+    "@odata.id": "/redfish/v1/ComponentIntegrity/SS-SPDM-0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/ComponentIntegrity/SS-SPDM-1/index.json b/public-rackmount1/ComponentIntegrity/SS-SPDM-1/index.json
new file mode 100644
index 0000000..42a50b5
--- /dev/null
+++ b/public-rackmount1/ComponentIntegrity/SS-SPDM-1/index.json
@@ -0,0 +1,66 @@
+{
+    "@odata.type": "#ComponentIntegrity.v1_2_0.ComponentIntegrity",
+    "Id": "SS-SPDM-1",
+    "Description": "SPDM Integrity Information for CPU1",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "ComponentIntegrityType": "SPDM",
+    "ComponentIntegrityTypeVersion": "1.1.0",
+    "ComponentIntegrityEnabled": true,
+    "TargetComponentURI": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1",
+    "LastUpdated": "2021-11-02T14:06:39-07:00",
+    "SPDM": {
+        "Requester": {
+            "@odata.id": "/redfish/v1/Managers/BMC"
+        },
+        "MeasurementSet": {
+            "MeasurementSpecification": "DMTF",
+            "MeasurementSummary": "oylHo8JAT1RqtB0Vlx9dCzogavikhSvIZpVEDhI1X1+TKeyZZvwuUb5qF9uWqPVa",
+            "MeasurementSummaryHashAlgorithm": "TPM_ALG_SHA_384",
+            "MeasurementSummaryType": "TCB",
+            "Measurements": [
+                {
+                    "MeasurementIndex": 1,
+                    "PartofSummaryHash": false,
+                    "LastUpdated": "2021-10-31T19:08:02-07:00",
+                    "Measurement": "K0zqzG/MFbeV7OVAhvDugxEzc7nMnRvdoKy8g2zU5JovPrUNSeFJxibTZE+0kOR9QhDR5RzumnomFECF8zI/Lw==",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA_512"
+                },
+                {
+                    "MeasurementIndex": 3,
+                    "PartofSummaryHash": true,
+                    "LastUpdated": "2021-10-31T19:08:02-07:00",
+                    "Measurement": "4wEF1nnub2ozuYTWyjyvFGrYnSn0eidy54uaIYXjp/HKRByaco9UtCZeyNfA3rQ3YsRD/6csLcqGw9Nd9/HPAw==",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA_512",
+                    "MeasurmentType": "ImmutableROM"
+                },
+                {
+                    "MeasurementIndex": 150,
+                    "PartofSummaryHash": true,
+                    "LastUpdated": "2021-10-31T19:08:02-07:00",
+                    "Measurement": "dZyksxnM/LZbSUY8INpp4wqcCM8m6XOKoy8cLaXOjUzqYYJT92AmEp7hKVFULNz1aCpKk69VULMyaDIv9hmJSQ==",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA_512"
+                }
+            ]
+        },
+        "IdentityAuthentication": {
+            "ResponderAuthentication": {
+                "ComponentCertificate": {
+                    "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/iRoT0/Certificates/DeviceCert"
+                }
+            }
+        },
+        "ComponentCommunication": {
+            "Sessions": [
+                {
+                    "SessionId": 15999130,
+                    "SessionType": "Plain"
+                }
+            ]
+        }
+    },
+    "@odata.id": "/redfish/v1/ComponentIntegrity/SS-SPDM-1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/ComponentIntegrity/TPM-0/index.json b/public-rackmount1/ComponentIntegrity/TPM-0/index.json
new file mode 100644
index 0000000..a73446b
--- /dev/null
+++ b/public-rackmount1/ComponentIntegrity/TPM-0/index.json
@@ -0,0 +1,60 @@
+{
+    "@odata.type": "#ComponentIntegrity.v1_2_0.ComponentIntegrity",
+    "Id": "TPM-0",
+    "Description": "This TPM is physically attached to a GPU and thus this TPM provides integrity protection for the GPU.",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "ComponentIntegrityType": "TPM",
+    "ComponentIntegrityTypeVersion": "1.2.0",
+    "ComponentIntegrityEnabled": true,
+    "LastUpdated": "2021-11-02T14:09:54-07:00",
+    "TargetComponentURI": "/redfish/v1/Chassis/1U/TrustedComponents/TPM",
+    "TPM": {
+        "MeasurementSet": {
+            "Measurements": [
+                {
+                    "PCR": 1,
+                    "Measurement": "h6spEuxbyOtGhP35UoGhTcVX3iRaZQGDw4Yk5oQcabw=",
+                    "LastUpdated": "2021-10-31T20:14:27-07:00",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA256"
+                },
+                {
+                    "PCR": 3,
+                    "Measurement": "GnbzS4ToNQb+Y7SxXw4AvRDTf4SzO5eeAlAlDca28AA=",
+                    "LastUpdated": "2021-10-31T20:14:27-07:00",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA256"
+                },
+                {
+                    "PCR": 1,
+                    "Measurement": "pLJa5Dyh8CDYFZ1WNOrsiSG1eyCPBlre42CD7CTywg7VkcC4afw4ZG3gQxi2XEFCt5jxz6tN1/cbx/DNx2/tOg==",
+                    "LastUpdated": "2021-10-31T20:14:27-07:00",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA512"
+                },
+                {
+                    "PCR": 3,
+                    "Measurement": "GBgEucATV8omirTmYqY+vvbbisHR1jBKfVAEK1XSifBHnnIYXopsc0NExURDSSyPjO21NrPqnwiq5LhI1p6rzQ==",
+                    "LastUpdated": "2021-10-31T20:14:27-07:00",
+                    "MeasurementHashAlgorithm": "TPM_ALG_SHA512"
+                }
+            ]
+        },
+        "IdentityAuthentication": {
+            "VerificationStatus": "Success",
+            "ComponentCertificate": {
+                "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/TPM/Certificates/EKCert"
+            }
+        },
+        "ComponentCommunication": {
+            "Sessions": [
+                {
+                    "SessionId": 4556,
+                    "SessionType": "Plain"
+                }
+            ]
+        }
+    },
+    "@odata.id": "/redfish/v1/ComponentIntegrity/TPM-0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/ComponentIntegrity/USB-Integrity/index.json b/public-rackmount1/ComponentIntegrity/USB-Integrity/index.json
new file mode 100644
index 0000000..2bb2870
--- /dev/null
+++ b/public-rackmount1/ComponentIntegrity/USB-Integrity/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#ComponentIntegrity.v1_2_0.ComponentIntegrity",
+    "Id": "USB-Integrity",
+    "Description": "SPDM Integrity Information for a USB controller. The SPDM protocol to this USB controller is completely disabled.",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "ComponentIntegrityType": "SPDM",
+    "ComponentIntegrityEnabled": false,
+    "TargetComponentURI": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/ComponentIntegrity/index.json b/public-rackmount1/ComponentIntegrity/index.json
new file mode 100644
index 0000000..f8fd7c9
--- /dev/null
+++ b/public-rackmount1/ComponentIntegrity/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#ComponentIntegrityCollection.ComponentIntegrityCollection",
+    "Name": "ComponentIntegrity Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/ComponentIntegrity/SS-SPDM-0"
+        },
+        {
+            "@odata.id": "/redfish/v1/ComponentIntegrity/USB-Integrity"
+        },
+        {
+            "@odata.id": "/redfish/v1/ComponentIntegrity/TPM-0"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/ComponentIntegrity",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/EventService/SubmitTestEventActionInfo/index.json b/public-rackmount1/EventService/SubmitTestEventActionInfo/index.json
index 1d00db4..3bb3e53 100644
--- a/public-rackmount1/EventService/SubmitTestEventActionInfo/index.json
+++ b/public-rackmount1/EventService/SubmitTestEventActionInfo/index.json
@@ -1,62 +1,63 @@
-{
-    "@odata.type": "#ActionInfo.v1_1_2.ActionInfo",
-    "Id": "SubmitTestEventActionInfo",
-    "Name": "SubmitTestEvent Action Info",
-    "Parameters": [
-        {
-            "Name": "EventType",
-            "Required": false,
-            "DataType": "String",
-            "AllowableValues": [
-                "StatusChange",
-                "ResourceUpdated",
-                "ResourceAdded",
-                "ResourceRemoved",
-                "Alert",
-                "Other"
-            ]
-        },
-        {
-            "Name": "EventId",
-            "Required": false,
-            "DataType": "String"
-        },
-        {
-            "Name": "EventTimestamp",
-            "Required": false,
-            "DataType": "String"
-        },
-        {
-            "Name": "Severity",
-            "Required": false,
-            "DataType": "String"
-        },
-        {
-            "Name": "Message",
-            "Required": false,
-            "DataType": "String"
-        },
-        {
-            "Name": "MessageId",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "MessageArgs",
-            "Required": false,
-            "DataType": "StringArray"
-        },
-        {
-            "Name": "OriginOfCondition",
-            "Required": false,
-            "DataType": "String"
-        },
-        {
-            "Name": "EventGroupId",
-            "Required": false,
-            "DataType": "Number"
-        }
-    ],
-    "Oem": {},
-    "@odata.id": "/redfish/v1/EventService/SubmitTestEventActionInfo"
-}
+{
+    "@odata.type": "#ActionInfo.v1_3_0.ActionInfo",
+    "Id": "SubmitTestEventActionInfo",
+    "Name": "SubmitTestEvent Action Info",
+    "Parameters": [
+        {
+            "Name": "EventType",
+            "Required": false,
+            "DataType": "String",
+            "AllowableValues": [
+                "StatusChange",
+                "ResourceUpdated",
+                "ResourceAdded",
+                "ResourceRemoved",
+                "Alert",
+                "Other"
+            ]
+        },
+        {
+            "Name": "EventId",
+            "Required": false,
+            "DataType": "String"
+        },
+        {
+            "Name": "EventTimestamp",
+            "Required": false,
+            "DataType": "String"
+        },
+        {
+            "Name": "Severity",
+            "Required": false,
+            "DataType": "String"
+        },
+        {
+            "Name": "Message",
+            "Required": false,
+            "DataType": "String"
+        },
+        {
+            "Name": "MessageId",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "MessageArgs",
+            "Required": false,
+            "DataType": "StringArray"
+        },
+        {
+            "Name": "OriginOfCondition",
+            "Required": false,
+            "DataType": "String"
+        },
+        {
+            "Name": "EventGroupId",
+            "Required": false,
+            "DataType": "Number"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/EventService/SubmitTestEventActionInfo",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/EventService/Subscriptions/1/index.json b/public-rackmount1/EventService/Subscriptions/1/index.json
index 7dc0d1d..2d42848 100644
--- a/public-rackmount1/EventService/Subscriptions/1/index.json
+++ b/public-rackmount1/EventService/Subscriptions/1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#EventDestination.v1_7_0.EventDestination",
+    "@odata.type": "#EventDestination.v1_13_0.EventDestination",
     "Id": "1",
     "Name": "EventSubscription 1",
     "Destination": "http://www.dnsname.com/Destination1",
@@ -9,5 +9,5 @@
     "Context": "WebUser3",
     "Protocol": "Redfish",
     "@odata.id": "/redfish/v1/EventService/Subscriptions/1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/EventService/Subscriptions/2/index.json b/public-rackmount1/EventService/Subscriptions/2/index.json
index 96d012d..c9aeb3f 100644
--- a/public-rackmount1/EventService/Subscriptions/2/index.json
+++ b/public-rackmount1/EventService/Subscriptions/2/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#EventDestination.v1_7_0.EventDestination",
+    "@odata.type": "#EventDestination.v1_13_0.EventDestination",
     "Id": "2",
     "Name": "SNMPv3 EventSubscription",
     "Destination": "contoso_user@snmp_server.contoso.com",
@@ -21,5 +21,5 @@
         "EncryptionProtocol": "CFB128_AES128"
     },
     "@odata.id": "/redfish/v1/EventService/Subscriptions/2",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/EventService/Subscriptions/3/index.json b/public-rackmount1/EventService/Subscriptions/3/index.json
index 5a4153a..89a09eb 100644
--- a/public-rackmount1/EventService/Subscriptions/3/index.json
+++ b/public-rackmount1/EventService/Subscriptions/3/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#EventDestination.v1_7_0.EventDestination",
+    "@odata.type": "#EventDestination.v1_13_0.EventDestination",
     "Id": "3",
     "Name": "EventSubscription for SMTP",
     "Destination": "mailto:spam@contoso.com",
@@ -10,5 +10,5 @@
     "Context": "EmailUser3",
     "Protocol": "SMTP",
     "@odata.id": "/redfish/v1/EventService/Subscriptions/3",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/EventService/Subscriptions/4/index.json b/public-rackmount1/EventService/Subscriptions/4/index.json
new file mode 100644
index 0000000..a780051
--- /dev/null
+++ b/public-rackmount1/EventService/Subscriptions/4/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#EventDestination.v1_13_0.EventDestination",
+    "Id": "4",
+    "Name": "EventSubscription for Remote syslog",
+    "Destination": "syslog://123.45.10:514",
+    "Context": "Syslog-Mockup",
+    "Protocol": "SyslogTCP",
+    "SyslogFilters": [
+        {
+            "LogFacilities": [
+                "Kern",
+                "User"
+            ],
+            "LowestSeverity": "Warning"
+        }
+    ],
+    "@odata.id": "/redfish/v1/EventService/Subscriptions/4",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/EventService/Subscriptions/index.json b/public-rackmount1/EventService/Subscriptions/index.json
index 2c6e03d..5a246dc 100644
--- a/public-rackmount1/EventService/Subscriptions/index.json
+++ b/public-rackmount1/EventService/Subscriptions/index.json
@@ -1,7 +1,7 @@
 {
     "@odata.type": "#EventDestinationCollection.EventDestinationCollection",
     "Name": "Event Subscriptions Collection",
-    "Members@odata.count": 3,
+    "Members@odata.count": 4,
     "Members": [
         {
             "@odata.id": "/redfish/v1/EventService/Subscriptions/1"
@@ -11,8 +11,11 @@
         },
         {
             "@odata.id": "/redfish/v1/EventService/Subscriptions/3"
+        },
+        {
+            "@odata.id": "/redfish/v1/EventService/Subscriptions/4"
         }
     ],
     "@odata.id": "/redfish/v1/EventService/Subscriptions",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/EventService/index.json b/public-rackmount1/EventService/index.json
index e2e5d76..941cd3a 100644
--- a/public-rackmount1/EventService/index.json
+++ b/public-rackmount1/EventService/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#EventService.v1_5_0.EventService",
+    "@odata.type": "#EventService.v1_9_0.EventService",
     "Id": "EventService",
     "Name": "Event Service",
     "Status": {
@@ -38,5 +38,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/EventService",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/KeyService/NVMeoFKeyPolicies/0/index.json b/public-rackmount1/KeyService/NVMeoFKeyPolicies/0/index.json
new file mode 100644
index 0000000..230b62f
--- /dev/null
+++ b/public-rackmount1/KeyService/NVMeoFKeyPolicies/0/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#KeyPolicy.v1_0_0.KeyPolicy",
+    "Id": "0",
+    "Name": "Default NVMeoF Key Policy",
+    "IsDefault": true,
+    "KeyPolicyType": "NVMeoF",
+    "NVMeoF": {
+        "SecurityTransportAllowList": [
+            "TLSv2",
+            "TLSv3"
+        ],
+        "CipherSuiteAllowList": [
+            "TLS_AES_128_GCM_SHA256",
+            "TLS_AES_256_GCM_SHA384"
+        ],
+        "SecurityProtocolAllowList": [
+            "DHHC",
+            "TLS_PSK"
+        ],
+        "DHGroupAllowList": [
+            "FFDHE2048",
+            "FFDHE3072",
+            "FFDHE4096",
+            "FFDHE6144",
+            "FFDHE8192"
+        ],
+        "SecureHashAllowList": [
+            "SHA384",
+            "SHA512"
+        ]
+    },
+    "@odata.id": "/redfish/v1/KeyService/NVMeoFKeyPolicies/0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/KeyService/NVMeoFKeyPolicies/index.json b/public-rackmount1/KeyService/NVMeoFKeyPolicies/index.json
new file mode 100644
index 0000000..9c2e71f
--- /dev/null
+++ b/public-rackmount1/KeyService/NVMeoFKeyPolicies/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#KeyPolicyCollection.KeyPolicyCollection",
+    "Name": "Key Policy Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/KeyService/NVMeoFKeyPolicies/0"
+        }
+    ],
+    "@odata.id": "/redfish/v1/KeyService/NVMeoFKeyPolicies",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/KeyService/NVMeoFSecrets/0/index.json b/public-rackmount1/KeyService/NVMeoFSecrets/0/index.json
new file mode 100644
index 0000000..6615395
--- /dev/null
+++ b/public-rackmount1/KeyService/NVMeoFSecrets/0/index.json
@@ -0,0 +1,18 @@
+{
+    "@odata.type": "#Key.v1_2_0.Key",
+    "Id": "0",
+    "Name": "NVMeoF key 0, target subsystem",
+    "KeyType": "NVMeoF",
+    "KeyString": "DHHC-1:00:ia6zGodOr4SEG0Zzaw398rpY0wqipUWj4jWjUh4HWUz6aQ2n:",
+    "NVMeoF": {
+        "NQN": "nqn.corp.com:nvme:target-subsystem-0001",
+        "SecurityProtocolType": "DHHC",
+        "HostKeyId": "1",
+        "SecureHashAllowList": [
+            "SHA384",
+            "SHA512"
+        ]
+    },
+    "@odata.id": "/redfish/v1/KeyService/NVMeoFSecrets/0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/KeyService/NVMeoFSecrets/1/index.json b/public-rackmount1/KeyService/NVMeoFSecrets/1/index.json
new file mode 100644
index 0000000..e416d77
--- /dev/null
+++ b/public-rackmount1/KeyService/NVMeoFSecrets/1/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#Key.v1_2_0.Key",
+    "Id": "1",
+    "Name": "NVMeoF key 1, host subsystem",
+    "KeyType": "NVMeoF",
+    "KeyString": "DHHC-1:00:ia6zGodOr4SEG0Zzaw398rpY0wqipUWj4jWjUh4HWUz6aQ2n:",
+    "NVMeoF": {
+        "NQN": "nqn.corp.com:nvme:host-subsystem-0001",
+        "SecurityProtocolType": "DHHC",
+        "SecureHashAllowList": [
+            "SHA384",
+            "SHA512"
+        ]
+    },
+    "@odata.id": "/redfish/v1/KeyService/NVMeoFSecrets/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/KeyService/NVMeoFSecrets/index.json b/public-rackmount1/KeyService/NVMeoFSecrets/index.json
new file mode 100644
index 0000000..ca7545d
--- /dev/null
+++ b/public-rackmount1/KeyService/NVMeoFSecrets/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#KeyCollection.KeyCollection",
+    "Name": "Key Collection",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/KeyService/NVMeoFSecrets/0"
+        },
+        {
+            "@odata.id": "/redfish/v1/KeyService/NVMeoFSecrets/1"
+        }
+    ],
+    "@odata.id": "/redfish/v1/KeyService/NVMeoFSecrets",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/KeyService/index.json b/public-rackmount1/KeyService/index.json
new file mode 100644
index 0000000..0c5ecd5
--- /dev/null
+++ b/public-rackmount1/KeyService/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#KeyService.v1_0_0.KeyService",
+    "Id": "KeyService",
+    "Name": "Key Service",
+    "Actions": {},
+    "NVMeoFSecrets": {
+        "@odata.id": "/redfish/v1/KeyService/NVMeoFSecrets"
+    },
+    "NVMeoFKeyPolicies": {
+        "@odata.id": "/redfish/v1/KeyService/NVMeoFKeyPolicies"
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/KeyService",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/DedicatedNetworkPorts/1/index.json b/public-rackmount1/Managers/BMC/DedicatedNetworkPorts/1/index.json
new file mode 100644
index 0000000..85efa9e
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/DedicatedNetworkPorts/1/index.json
@@ -0,0 +1,39 @@
+{
+    "@odata.type": "#Port.v1_8_0.Port",
+    "CurrentSpeedGbps": 0.1,
+    "Ethernet": {
+        "FlowControlConfiguration": "TX_RX",
+        "FlowControlStatus": "TX_RX",
+        "SupportedEthernetCapabilities": [
+            "WakeOnLAN"
+        ],
+        "LLDPEnabled": true,
+        "LLDPTransmit": {},
+        "LLDPReceive": {}
+    },
+    "LinkConfiguration": [
+        {
+            "AutoSpeedNegotiationCapable": true,
+            "AutoSpeedNegotiationEnabled": true,
+            "CapableLinkSpeedGbps": [
+                0.1
+            ]
+        }
+    ],
+    "LinkNetworkTechnology": "Ethernet",
+    "LinkState": "Enabled",
+    "LinkStatus": "LinkUp",
+    "MaxFrameSize": 1500,
+    "MaxSpeedGbps": 0.1,
+    "PortMedium": "Electrical",
+    "PortType": "UpstreamPort",
+    "Links": {
+        "EthernetInterfaces": [
+            {
+                "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/eth0"
+            }
+        ]
+    },
+    "@odata.id": "/redfish/v1/Managers/BMC/DedicatedNetworkPorts/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/DedicatedNetworkPorts/index.json b/public-rackmount1/Managers/BMC/DedicatedNetworkPorts/index.json
new file mode 100644
index 0000000..7f25564
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/DedicatedNetworkPorts/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#PortCollection.PortCollection",
+    "Name": "Port Collection",
+    "Description": "Collection of dedicated network ports for this manager",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Managers/BMC/DedicatedNetworkPorts/1"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Managers/BMC/DedicatedNetworkPorts",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/EthernetInterfaces/ToHost/index.json b/public-rackmount1/Managers/BMC/EthernetInterfaces/ToHost/index.json
new file mode 100644
index 0000000..1dfba49
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/EthernetInterfaces/ToHost/index.json
@@ -0,0 +1,57 @@
+{
+    "@odata.type": "#EthernetInterface.v1_9_0.EthernetInterface",
+    "Id": "ToHost",
+    "Name": "Manager Ethernet Interface",
+    "Description": "Management Network Interface",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "InterfaceEnabled": true,
+    "PermanentMACAddress": "AA:BB:CC:DD:EE:FF",
+    "MACAddress": "AA:BB:CC:DD:EE:FF",
+    "SpeedMbps": 100,
+    "AutoNeg": true,
+    "FullDuplex": true,
+    "MTUSize": 1500,
+    "HostName": "bmc-host-interface",
+    "FQDN": "bmc-host-interface.dmtf.org",
+    "MaxIPv6StaticAddresses": 1,
+    "IPv4Addresses": [
+        {
+            "Address": "192.168.20.55",
+            "SubnetMask": "255.255.255.0",
+            "AddressOrigin": "Static",
+            "Gateway": "192.168.20.1"
+        }
+    ],
+    "IPv6AddressPolicyTable": [
+        {
+            "Prefix": "::1/128",
+            "Precedence": 50,
+            "Label": 0
+        }
+    ],
+    "IPv6StaticAddresses": [
+        {
+            "Address": "fe80::1ec1:deff:fe6f:1e24",
+            "PrefixLength": 64
+        }
+    ],
+    "IPv6DefaultGateway": "fe80::1ec1:deff:fe6f:1e24",
+    "IPv6Addresses": [
+        {
+            "Address": "fe80::1ec1:deff:fe6f:1e24",
+            "PrefixLength": 64,
+            "AddressOrigin": "Static",
+            "AddressState": "Preferred"
+        }
+    ],
+    "Links": {
+        "HostInterface": {
+            "@odata.id": "/redfish/v1/Managers/BMC/HostInterfaces/1"
+        }
+    },
+    "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/ToHost",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/EthernetInterfaces/Dedicated/SD/index.json b/public-rackmount1/Managers/BMC/EthernetInterfaces/eth0/SD/index.json
similarity index 84%
rename from public-rackmount1/Managers/BMC/EthernetInterfaces/Dedicated/SD/index.json
rename to public-rackmount1/Managers/BMC/EthernetInterfaces/eth0/SD/index.json
index 2cfd692..46341c4 100644
--- a/public-rackmount1/Managers/BMC/EthernetInterfaces/Dedicated/SD/index.json
+++ b/public-rackmount1/Managers/BMC/EthernetInterfaces/eth0/SD/index.json
@@ -1,8 +1,8 @@
 {
-    "@odata.type": "#EthernetInterface.v1_5_1.EthernetInterface",
+    "@odata.type": "#EthernetInterface.v1_9_0.EthernetInterface",
     "Id": "SD",
     "Name": "Manager Ethernet Interface",
-    "Description": "Management Network Interface",
+    "Description": "Management network interface on a dedicated port",
     "Status": {
         "State": "Enabled",
         "Health": "OK"
@@ -58,6 +58,6 @@
         "names.dmtf.org"
     ],
     "Oem": {},
-    "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/Dedicated/SD",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/eth0/SD",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/EthernetInterfaces/Dedicated/index.json b/public-rackmount1/Managers/BMC/EthernetInterfaces/eth0/index.json
similarity index 76%
rename from public-rackmount1/Managers/BMC/EthernetInterfaces/Dedicated/index.json
rename to public-rackmount1/Managers/BMC/EthernetInterfaces/eth0/index.json
index 8799723..a412ff9 100644
--- a/public-rackmount1/Managers/BMC/EthernetInterfaces/Dedicated/index.json
+++ b/public-rackmount1/Managers/BMC/EthernetInterfaces/eth0/index.json
@@ -1,8 +1,8 @@
 {
-    "@odata.type": "#EthernetInterface.v1_5_1.EthernetInterface",
-    "Id": "Dedicated",
+    "@odata.type": "#EthernetInterface.v1_9_0.EthernetInterface",
+    "Id": "eth0",
     "Name": "Manager Ethernet Interface",
-    "Description": "Management Network Interface",
+    "Description": "Management network interface on a dedicated port",
     "Status": {
         "State": "Enabled",
         "Health": "OK"
@@ -57,10 +57,17 @@
     "NameServers": [
         "names.dmtf.org"
     ],
+    "Links": {
+        "Ports": [
+            {
+                "@odata.id": "/redfish/v1/Managers/BMC/DedicatedNetworkPorts/1"
+            }
+        ]
+    },
     "@Redfish.Settings": {
-        "@odata.type": "#Settings.v1_3_0.Settings",
+        "@odata.type": "#Settings.v1_3_5.Settings",
         "SettingsObject": {
-            "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/Dedicated/SD"
+            "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/eth0/SD"
         },
         "Time": "2012-03-07T14:44.30-05:00",
         "ETag": "84ffcbb050ddc7fa9cddb59014546e59",
@@ -68,12 +75,12 @@
             {
                 "MessageId": "Base.1.0.SettingsFailed",
                 "RelatedProperties": [
-                    "#/IPv6Addresses/PrefixLength"
+                    "/IPv6Addresses/PrefixLength"
                 ]
             }
         ]
     },
     "Oem": {},
-    "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/Dedicated",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/eth0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/EthernetInterfaces/index.json b/public-rackmount1/Managers/BMC/EthernetInterfaces/index.json
index 52d587f..3140dd4 100644
--- a/public-rackmount1/Managers/BMC/EthernetInterfaces/index.json
+++ b/public-rackmount1/Managers/BMC/EthernetInterfaces/index.json
@@ -2,13 +2,16 @@
     "@odata.type": "#EthernetInterfaceCollection.EthernetInterfaceCollection",
     "Name": "Ethernet Network Interface Collection",
     "Description": "Collection of EthernetInterfaces for this Manager",
-    "Members@odata.count": 1,
+    "Members@odata.count": 2,
     "Members": [
         {
-            "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/Dedicated"
+            "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/eth0"
+        },
+        {
+            "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/ToHost"
         }
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/HostInterfaces/1/HostEthernetInterfaces/index.json b/public-rackmount1/Managers/BMC/HostInterfaces/1/HostEthernetInterfaces/index.json
new file mode 100644
index 0000000..811e2d8
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/HostInterfaces/1/HostEthernetInterfaces/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#EthernetInterfaceCollection.EthernetInterfaceCollection",
+    "Name": "Ethernet Network Interface Collection",
+    "Description": "Collection of EthernetInterfaces hosts connected to this HostInterface on the Manager",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/ToManager"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Managers/BMC/HostInterfaces/1/HostEthernetInterfaces",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/HostInterfaces/1/index.json b/public-rackmount1/Managers/BMC/HostInterfaces/1/index.json
new file mode 100644
index 0000000..6df2c80
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/HostInterfaces/1/index.json
@@ -0,0 +1,46 @@
+{
+    "@odata.type": "#HostInterface.v1_3_0.HostInterface",
+    "Id": "1",
+    "Name": "Host Interface",
+    "Description": "Management Host Interface",
+    "HostInterfaceType": "NetworkHostInterface",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "InterfaceEnabled": true,
+    "ExternallyAccessible": false,
+    "AuthenticationModes": [
+        "AuthNone",
+        "BasicAuth",
+        "RedfishSessionAuth",
+        "OemAuth"
+    ],
+    "CredentialBootstrapping": {
+        "RoleId": "Administrator",
+        "Enabled": true,
+        "EnableAfterReset": true
+    },
+    "HostEthernetInterfaces": {
+        "@odata.id": "/redfish/v1/Managers/BMC/HostInterfaces/1/HostEthernetInterfaces"
+    },
+    "ManagerEthernetInterface": {
+        "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces/ToHost"
+    },
+    "NetworkProtocol": {
+        "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol"
+    },
+    "Links": {
+        "ComputerSystems": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2"
+            }
+        ],
+        "CredentialBootstrappingRole": {
+            "@odata.id": "/redfish/v1/AccountService/Roles/Administrator"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Managers/BMC/HostInterfaces/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/HostInterfaces/index.json b/public-rackmount1/Managers/BMC/HostInterfaces/index.json
new file mode 100644
index 0000000..3e2cd2a
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/HostInterfaces/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#HostInterfaceCollection.HostInterfaceCollection",
+    "Name": "Host Interface Collection",
+    "Description": "Collection of HostInterfaces for this Manager",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Managers/BMC/HostInterfaces/1"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Managers/BMC/HostInterfaces",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/LogServices/Log/Entries/1/index.json b/public-rackmount1/Managers/BMC/LogServices/Log/Entries/1/index.json
index e3a94e7..fd78ea1 100644
--- a/public-rackmount1/Managers/BMC/LogServices/Log/Entries/1/index.json
+++ b/public-rackmount1/Managers/BMC/LogServices/Log/Entries/1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#LogEntry.v1_5_1.LogEntry",
+    "@odata.type": "#LogEntry.v1_14_0.LogEntry",
     "Id": "1",
     "Name": "Log Entry 1",
     "EntryType": "Event",
@@ -19,5 +19,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/Managers/BMC/LogServices/Log/Entries/1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/LogServices/Log/Entries/index.json b/public-rackmount1/Managers/BMC/LogServices/Log/Entries/index.json
index 9acff7c..4947297 100644
--- a/public-rackmount1/Managers/BMC/LogServices/Log/Entries/index.json
+++ b/public-rackmount1/Managers/BMC/LogServices/Log/Entries/index.json
@@ -6,7 +6,7 @@
     "Members": [
         {
             "@odata.id": "/redfish/v1/Managers/BMC/LogServices/Log/Entries/1",
-            "@odata.type": "#LogEntry.v1_5_1.LogEntry",
+            "@odata.type": "#LogEntry.v1_14_0.LogEntry",
             "Id": "1",
             "Name": "Log Entry 1",
             "EntryType": "Event",
@@ -28,5 +28,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Managers/BMC/LogServices/Log/Entries",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/LogServices/Log/index.json b/public-rackmount1/Managers/BMC/LogServices/Log/index.json
index 6354191..14e6885 100644
--- a/public-rackmount1/Managers/BMC/LogServices/Log/index.json
+++ b/public-rackmount1/Managers/BMC/LogServices/Log/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#LogService.v1_1_3.LogService",
+    "@odata.type": "#LogService.v1_4_0.LogService",
     "Id": "Log",
     "Name": "System Log Service",
     "MaxNumberOfRecords": 1000,
@@ -22,5 +22,5 @@
         "@odata.id": "/redfish/v1/Managers/BMC/LogServices/Log/Entries"
     },
     "@odata.id": "/redfish/v1/Managers/BMC/LogServices/Log",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/LogServices/index.json b/public-rackmount1/Managers/BMC/LogServices/index.json
index 5951785..db51a59 100644
--- a/public-rackmount1/Managers/BMC/LogServices/index.json
+++ b/public-rackmount1/Managers/BMC/LogServices/index.json
@@ -9,5 +9,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Managers/BMC/LogServices",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/RekeyActionInfo/index.json b/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/RekeyActionInfo/index.json
index 1664d22..7df5b3d 100644
--- a/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/RekeyActionInfo/index.json
+++ b/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/RekeyActionInfo/index.json
@@ -1,34 +1,34 @@
-{
-    "@odata.type": "#ActionInfo.v1_1_2.ActionInfo",
-    "Id": "RekeyActionInfo",
-    "Name": "Rekey Action Info",
-    "Parameters": [
-        {
-            "Name": "KeyPairAlgorithm",
-            "Required": true,
-            "DataType": "String",
-            "AllowableValues": [
-                "TPM_ALG_RSA",
-                "TPM_ALG_ECDSA"
-            ]
-        },
-        {
-            "Name": "KeyBitLength",
-            "Required": false,
-            "DataType": "Number"
-        },
-        {
-            "Name": "KeyCurveId",
-            "Required": false,
-            "DataType": "String",
-            "AllowableValues": [
-                "TPM_ECC_NIST_P256",
-                "TPM_ECC_NIST_P384",
-                "TPM_ECC_NIST_P521"
-            ]
-        }
-    ],
-    "Oem": {},
-    "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/RekeyActionInfo",
-    "@Redfish.Copyright": "Copyright 2018-2019 DMTF. All rights reserved."
-}
+{
+    "@odata.type": "#ActionInfo.v1_3_0.ActionInfo",
+    "Id": "RekeyActionInfo",
+    "Name": "Rekey Action Info",
+    "Parameters": [
+        {
+            "Name": "KeyPairAlgorithm",
+            "Required": true,
+            "DataType": "String",
+            "AllowableValues": [
+                "TPM_ALG_RSA",
+                "TPM_ALG_ECDSA"
+            ]
+        },
+        {
+            "Name": "KeyBitLength",
+            "Required": false,
+            "DataType": "Number"
+        },
+        {
+            "Name": "KeyCurveId",
+            "Required": false,
+            "DataType": "String",
+            "AllowableValues": [
+                "TPM_ECC_NIST_P256",
+                "TPM_ECC_NIST_P384",
+                "TPM_ECC_NIST_P521"
+            ]
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/RekeyActionInfo",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/index.json b/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/index.json
index cfae406..f057e8e 100644
--- a/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/index.json
+++ b/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Certificate.v1_1_1.Certificate",
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
     "Id": "1",
     "Name": "HTTPS Certificate",
     "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIFsTCCA5mgAwIBAgIJAMusGfV8beSJMA0GCSqGSIb3DQEBCwUAMG8xCzAJBgNV\nBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYD\nVQQKDAdDb250b3NvMQwwCgYDVQQLDANBQkMxHDAaBgNVBAMME21hbmFnZXIuY29u\ndG9zby5vcmcwHhcNMTgwOTA3MTMyMjA1WhcNMTkwOTA3MTMyMjA1WjBvMQswCQYD\nVQQGEwJVUzEPMA0GA1UECAwGT3JlZ29uMREwDwYDVQQHDAhQb3J0bGFuZDEQMA4G\nA1UECgwHQ29udG9zbzEMMAoGA1UECwwDQUJDMRwwGgYDVQQDDBNtYW5hZ2VyLmNv\nbnRvc28ub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw39VGz5K\n9bD8UUmyUxH+s+IaYsd3rd8V3R6g3bzttGOW52nopt3ZQD4COHPePBcCBh2+xRFk\n0Wd6oJUECXKNYhoFRJAhyz2fmkO5I37D40iY8/Ihqnt0Kmt/8hETL2VMKbALnR+4\nAUNNGSomRD24FQDlK1Vs6urZHvTsEL5Z+CNdbKY6Yn1ksxR8vmze4hdxnzrQCua1\no7zNVzudLdhVpfeC3BvmflMjszPOjlo5dSkXeRWqQ1LikgcHyEf3hYWq3WXMUpkV\nm2nlM3Tzeaz2nO1quQ/HJ/DUuvHHvWIIZdExL1RABzSN8Sr3ZkMShmTNN4QWmrEX\nEADN8g8OXrRKrup+R6nbUT55Getn5jPesI5fNDHk0KRBUG0ALY73l9+ZlAdRTesq\naV6AL2hUYrb1SNjh50i15s4yPOytspF4B9LaqsG1w3PGjgLaUtWHTXwGAMdHVhWs\nym//6zFv3Ri5tbjThpeYv+UIkreyb0yAFlx/Kz62EFbkFcnaGPATqVd4yLtVdYu0\nz5O8JWhOuybmWMe6ifO97X8w7/Nr9QyzkB64wXSqsNpRiuZraErqa+hBqvPkz8KE\nFEwiclRvZ9OrNk/iKr1FO1HNs1byvNyJ3S9Bu4bMwMnxzrdNzaB5Ti0IywIvQ/qw\nJ8icHIn+3EM5g+DmvQTZIXNKOryrndjIUA0CAwEAAaNQME4wHQYDVR0OBBYEFLLG\niNCud7LYUKojqRVNhKBWoApFMB8GA1UdIwQYMBaAFLLGiNCud7LYUKojqRVNhKBW\noApFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAG+NJSRv1S0K4KjE\nwzAIlEsmYs65vPxKLg0a07EW8xO4m7AKtty9dyc3+xh0ftwosTmXp2GL3RbNFqpc\nqDjS/XLDGS7DCb5T/g2vZusfUCz6WXpJCZMBLNyNaVyhTHeV9f8sCWXAODwx8ED2\nIHADWI9EqYg3HovYJNP4iUXfivBkFdq6ptOwgMVLGpeMvt/VwBilOklL/+xrhiMD\n1SwZ+sPdWfgcIaeQ+Y3h0cbHzCeYlZDXjDR41zGrEb1lhSAj5n/BEQDjXsiIY386\n/czYW7Zz2ZxOK67ENaABUxg5w8iqu8wkF0pVHbjBThkEPvvdwWKAFLDC55q1KO4H\nsZLx8U/usUdHW9pz+/C7QW7UEJjKP7LfUWnosz7NJYtb7lXJ6pyLkstlA35/aXv3\nxS4eHxHFExl7hiTPgWuFYZUfhdTYSoUTO7WHI7IIZvAh05I/akrE7RpPXviMdIrI\nluKOGwMDHuKSUX93BfFcm9WyMx2cGvbORAXPonGadkPbNsuSK1YkalZ27x5Aq10T\nwJ6/u29+BMDIRB1qJPf5gm4itQpX0hLKXRAdSPKQgvA2gDN5fIlPDEAlWt3oo5JI\n6aWKaL1zAwSFcV2XE6c0r9ZrQPQw1cTzeAMDzMQ7MnEb6kt/YNdGfzTL/5b+vF+e\nHApck5WMN3G/8qlI5rFGXG5zljlu\n-----END CERTIFICATE-----",
@@ -26,6 +26,10 @@
         "KeyEncipherment",
         "ServerAuthentication"
     ],
+    "SerialNumber": "5d:7a:d8:df:f6:fc:c1:b3:ca:fe:fb:cc:38:f3:01:64:51:ea:05:cb",
+    "Fingerprint": "A6:E9:D2:5C:DC:52:DA:4B:3B:14:97:F3:A4:53:D9:99:A1:0B:56:41",
+    "FingerprintHashAlgorithm": "TPM_ALG_SHA1",
+    "SignatureAlgorithm": "sha256WithRSAEncryption",
     "Actions": {
         "#Certificate.Rekey": {
             "target": "/redfish/v1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1/Actions/Certificate.Rekey",
@@ -37,5 +41,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/index.json b/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/index.json
index b414839..36fd36a 100644
--- a/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/index.json
+++ b/public-rackmount1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/index.json
@@ -12,5 +12,5 @@
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol/HTTPS/Certificates",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/NetworkProtocol/index.json b/public-rackmount1/Managers/BMC/NetworkProtocol/index.json
index 5cbe452..aff867c 100644
--- a/public-rackmount1/Managers/BMC/NetworkProtocol/index.json
+++ b/public-rackmount1/Managers/BMC/NetworkProtocol/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#ManagerNetworkProtocol.v1_5_0.ManagerNetworkProtocol",
+    "@odata.type": "#ManagerNetworkProtocol.v1_9_1.ManagerNetworkProtocol",
     "Id": "NetworkProtocol",
     "Name": "Manager Network Protocol",
     "Description": "Manager Network Service",
@@ -20,6 +20,15 @@
             "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol/HTTPS/Certificates"
         }
     },
+    "Proxy": {
+        "Enabled": true,
+        "ProxyServerURI": "https://proxy.intranet.contoso.com:9900",
+        "Username": "proxy",
+        "Password": null,
+        "PasswordSet": true,
+        "ExcludeAddresses": [],
+        "ProxyAutoConfigURI": "proxy.intranet.contoso.com/proxy.pac"
+    },
     "IPMI": {
         "ProtocolEnabled": true,
         "Port": 623
@@ -75,5 +84,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/RevokedCertificates/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/RevokedCertificates/index.json
new file mode 100644
index 0000000..0983d05
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/RevokedCertificates/index.json
@@ -0,0 +1,8 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificates Collection",
+    "Members@odata.count": 0,
+    "Members": [],
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/SPDM/RevokedCertificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates/contoso-root/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates/contoso-root/index.json
new file mode 100644
index 0000000..6a0c86a
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates/contoso-root/index.json
@@ -0,0 +1,9 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "contoso-root",
+    "Name": "Contoso Root CA",
+    "CertificateType": "PEM",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIFPjCCAyYCCQCSFsIudUer0DANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJV\nUzEQMA4GA1UECAwHUmVkZmlzaDEbMBkGA1UEBwwSTm90LUhlcmUtTm90LVRoZXJl\nMRAwDgYDVQQKDAdDb250b3NvMRAwDgYDVQQLDAdSZWRmaXNoMCAXDTIxMTAwNzE4\nNTkwN1oYDzIwOTkxMDA4MTg1OTA3WjBgMQswCQYDVQQGEwJVUzEQMA4GA1UECAwH\nUmVkZmlzaDEbMBkGA1UEBwwSTm90LUhlcmUtTm90LVRoZXJlMRAwDgYDVQQKDAdD\nb250b3NvMRAwDgYDVQQLDAdSZWRmaXNoMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A\nMIICCgKCAgEAwK877tRnOqMACIu/fpN1BD0nZWhy0l5s/gtcuGTM3WhlvQr1/j1D\nj5J8/gCFWNWtGNlLUNdqCUgE/Mki4zdkc4RGqlW9SpdIq+3Wn/lnNmTzjWPfsNaM\n7GMW+gYxDuQf/Pw/h6qXMBZ6JIy/ilAwzV6qJCuJhmSm6O9V+KENoKPWNUYyWnsb\nEJdTYmf58opMgSxdi032hML5gAdMWlIXQcQjX0crr0Ey9VC5WyDSm9/SKY9x6uMM\nTEGBl5NAFa3J05AGrmsgpA8QU4WzKe77DqWeTx9ZKHkqqRUK0onbXGDL8KDOXJr8\nvQSFgiAa3bnVNhUjsDik0xq2QrmHcy72i9xd9AlH3yC/2EMNHnVeJ8Sbhz9rHaSj\nPVxXvorMM650ZDCocVgIBqf3TwxDzC+aBRkXQVLadvnwpg54AHKoIGA0djvROgrZ\nZp7Au+wxy6OzYT6+hGe3I7mPPmRgz9D1BV9M4QdvbKVJPSMcWIEEd6ENrXP97H4j\ngpvql+zTJcZ5kF/RwVLRwxIPyN49gwJP8MMdWp+jvItO8obmdDLZFhGXyF5f19jt\nMWCHybucvLJml7jFJYqNqi5rr1ShAYdV9WbS3hYfBz1xytYP0Rb/5xaBFMvRUBzt\nvU8V1AOLNb8TfbNaqZx1XJTL1NhrKebtBSAtRRcTiD8p8wmDjSZcV0cCAwEAATAN\nBgkqhkiG9w0BAQsFAAOCAgEAOABtLDFso1UBwas4l+LZt0f2OxJWMRNLtNDwOy22\na3diIO3WaX6qD5oy9aj+cANZ15k1UZ3idW0hIVYvz5YESKqP8VW0QW2G/2fWGFlB\nRp+mfd0rW++2uFzKlQjfqRUllG17tfy+zUixWubgkqL39/FFRP0HRUt9cm9qfXys\nvM0VzlXxrlP0Y00onXoqlvGRcmSUOU+Kt5KJkXSSaGAfouPpWEU6qwl+qTAqHMf7\nAXhcsHEFJZe+iVr2cR5GTjGiNbQG0bjgnuSRHCFR9+E8mOoiVfZ5cRy4njGkSUi0\nD/KCpoIiSrxqyaHeSyFA81q8Co2aELirS8bpg38b3IZW6U7ITZH/IcvqBCvpOdXi\n43vVgruJlclqtjoPMYQLTbP2bsiNRdqG+xQF2jOVqrN3Kpmvm+4HDaKUN4TlPVOs\n25z7JTGn0i6fSlv7Gg+4Cox0FPrbSmX1OON61pDGfUJs343EBQ0AQwU4qVYkWFqb\nMd1/YMhYIJVRsIX8XXF7hSmA614um+vvc8TlfJwfUIl54I9m8Uu11GeUceL1Ts75\n97yFurEMLmR9sJSzuM3Sez96LNb0LeYwJRdpI6ttc2/v8hfRXOlRPRJAoJkdRQDh\nH++X8r/eTIWoZT/vOAY+CdFsJ10MCcjndA4AwDmQ1AWXvbuFV5ByO53mjNn4xRpu\nwUo=\n-----END CERTIFICATE-----",
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates/contoso-root",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates/index.json
new file mode 100644
index 0000000..55e9520
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificates Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates/contoso-root"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Client/RevokedCertificates/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Client/RevokedCertificates/index.json
new file mode 100644
index 0000000..204e8c7
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Client/RevokedCertificates/index.json
@@ -0,0 +1,8 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificates Collection",
+    "Members@odata.count": 0,
+    "Members": [],
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Client/RevokedCertificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Client/TrustedCertificates/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Client/TrustedCertificates/index.json
new file mode 100644
index 0000000..cfd9af9
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Client/TrustedCertificates/index.json
@@ -0,0 +1,8 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificates Collection",
+    "Members@odata.count": 0,
+    "Members": [],
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Client/TrustedCertificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/RevokedCertificates/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/RevokedCertificates/index.json
new file mode 100644
index 0000000..96143c0
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/RevokedCertificates/index.json
@@ -0,0 +1,8 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificates Collection",
+    "Members@odata.count": 0,
+    "Members": [],
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Server/RevokedCertificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates/contoso-root/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates/contoso-root/index.json
new file mode 100644
index 0000000..bb9f6cb
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates/contoso-root/index.json
@@ -0,0 +1,9 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "contoso-root",
+    "Name": "Contoso Root CA",
+    "CertificateType": "PEM",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIFPjCCAyYCCQCSFsIudUer0DANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJV\nUzEQMA4GA1UECAwHUmVkZmlzaDEbMBkGA1UEBwwSTm90LUhlcmUtTm90LVRoZXJl\nMRAwDgYDVQQKDAdDb250b3NvMRAwDgYDVQQLDAdSZWRmaXNoMCAXDTIxMTAwNzE4\nNTkwN1oYDzIwOTkxMDA4MTg1OTA3WjBgMQswCQYDVQQGEwJVUzEQMA4GA1UECAwH\nUmVkZmlzaDEbMBkGA1UEBwwSTm90LUhlcmUtTm90LVRoZXJlMRAwDgYDVQQKDAdD\nb250b3NvMRAwDgYDVQQLDAdSZWRmaXNoMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A\nMIICCgKCAgEAwK877tRnOqMACIu/fpN1BD0nZWhy0l5s/gtcuGTM3WhlvQr1/j1D\nj5J8/gCFWNWtGNlLUNdqCUgE/Mki4zdkc4RGqlW9SpdIq+3Wn/lnNmTzjWPfsNaM\n7GMW+gYxDuQf/Pw/h6qXMBZ6JIy/ilAwzV6qJCuJhmSm6O9V+KENoKPWNUYyWnsb\nEJdTYmf58opMgSxdi032hML5gAdMWlIXQcQjX0crr0Ey9VC5WyDSm9/SKY9x6uMM\nTEGBl5NAFa3J05AGrmsgpA8QU4WzKe77DqWeTx9ZKHkqqRUK0onbXGDL8KDOXJr8\nvQSFgiAa3bnVNhUjsDik0xq2QrmHcy72i9xd9AlH3yC/2EMNHnVeJ8Sbhz9rHaSj\nPVxXvorMM650ZDCocVgIBqf3TwxDzC+aBRkXQVLadvnwpg54AHKoIGA0djvROgrZ\nZp7Au+wxy6OzYT6+hGe3I7mPPmRgz9D1BV9M4QdvbKVJPSMcWIEEd6ENrXP97H4j\ngpvql+zTJcZ5kF/RwVLRwxIPyN49gwJP8MMdWp+jvItO8obmdDLZFhGXyF5f19jt\nMWCHybucvLJml7jFJYqNqi5rr1ShAYdV9WbS3hYfBz1xytYP0Rb/5xaBFMvRUBzt\nvU8V1AOLNb8TfbNaqZx1XJTL1NhrKebtBSAtRRcTiD8p8wmDjSZcV0cCAwEAATAN\nBgkqhkiG9w0BAQsFAAOCAgEAOABtLDFso1UBwas4l+LZt0f2OxJWMRNLtNDwOy22\na3diIO3WaX6qD5oy9aj+cANZ15k1UZ3idW0hIVYvz5YESKqP8VW0QW2G/2fWGFlB\nRp+mfd0rW++2uFzKlQjfqRUllG17tfy+zUixWubgkqL39/FFRP0HRUt9cm9qfXys\nvM0VzlXxrlP0Y00onXoqlvGRcmSUOU+Kt5KJkXSSaGAfouPpWEU6qwl+qTAqHMf7\nAXhcsHEFJZe+iVr2cR5GTjGiNbQG0bjgnuSRHCFR9+E8mOoiVfZ5cRy4njGkSUi0\nD/KCpoIiSrxqyaHeSyFA81q8Co2aELirS8bpg38b3IZW6U7ITZH/IcvqBCvpOdXi\n43vVgruJlclqtjoPMYQLTbP2bsiNRdqG+xQF2jOVqrN3Kpmvm+4HDaKUN4TlPVOs\n25z7JTGn0i6fSlv7Gg+4Cox0FPrbSmX1OON61pDGfUJs343EBQ0AQwU4qVYkWFqb\nMd1/YMhYIJVRsIX8XXF7hSmA614um+vvc8TlfJwfUIl54I9m8Uu11GeUceL1Ts75\n97yFurEMLmR9sJSzuM3Sez96LNb0LeYwJRdpI6ttc2/v8hfRXOlRPRJAoJkdRQDh\nH++X8r/eTIWoZT/vOAY+CdFsJ10MCcjndA4AwDmQ1AWXvbuFV5ByO53mjNn4xRpu\nwUo=\n-----END CERTIFICATE-----",
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates/contoso-root",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates/index.json
new file mode 100644
index 0000000..97771a9
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificates Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates/contoso-root"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SecurityPolicy/index.json b/public-rackmount1/Managers/BMC/SecurityPolicy/index.json
new file mode 100644
index 0000000..eae67e3
--- /dev/null
+++ b/public-rackmount1/Managers/BMC/SecurityPolicy/index.json
@@ -0,0 +1,129 @@
+{
+    "@odata.type": "#SecurityPolicy.v1_0_0.SecurityPolicy",
+    "Id": "Manager's Global Security Policy",
+    "Description": "This is the global security policy for all components and communications managed by this Manager.",
+    "Status": {
+        "Health": "OK",
+        "State": "Enabled"
+    },
+    "Oem": {},
+    "OverrideParentManager": true,
+    "SPDM": {
+        "Enabled": true,
+        "SecureSessionEnabled": true,
+        "VerifyCertificate": true,
+        "TrustedCertificates": {
+            "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/SPDM/TrustedCertificates"
+        },
+        "RevokedCertificates": {
+            "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/SPDM/RevokedCertificates"
+        },
+        "Allowed": {
+            "Versions": [
+                "ALL"
+            ],
+            "Algorithms": {
+                "AEAD": [
+                    "AES-GCM-256",
+                    "AES-GCM-128"
+                ],
+                "BaseAsym": [
+                    "TPM_ALG_RSASSA_2048",
+                    "TPM_ALG_ECDSA_ECC_NIST_P384",
+                    "TPM_ALG_SM2_ECC_SM2_P256"
+                ],
+                "BaseHash": [
+                    "TPM_ALG_SHA_512",
+                    "TPM_ALG_SHA3_512"
+                ]
+            }
+        },
+        "Denied": {
+            "Versions": [
+                "NONE"
+            ],
+            "Algorithms": {
+                "AEAD": [],
+                "BaseAsym": [
+                    "EdDSA ed25519"
+                ],
+                "BaseHash": [
+                    "TPM_ALG_SHA_256"
+                ]
+            }
+        },
+        "AllowExtendedAlgorithms": false
+    },
+    "TLS": {
+        "Client": {
+            "VerifyCertificate": true,
+            "TrustedCertificates": {
+                "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Server/TrustedCertificates"
+            },
+            "RevokedCertificates": {
+                "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Server/RevokedCertificates"
+            },
+            "Allowed": {
+                "Versions": [
+                    "1.2",
+                    "1.3"
+                ],
+                "Algorithms": {
+                    "CipherSuites": [
+                        "TLS_AES_128_GCM_SHA256",
+                        "TLS_AES_128_GCM_SHA384"
+                    ],
+                    "SignatureAlgorithms": []
+                }
+            },
+            "Denied": {
+                "Versions": [
+                    "1.1"
+                ],
+                "Algorithms": {
+                    "CipherSuites": [],
+                    "SignatureAlgorithms": [
+                        "rsa_pkcs1_sha1",
+                        "ecdsa_sha1"
+                    ]
+                }
+            }
+        },
+        "Server": {
+            "VerifyCertificate": false,
+            "TrustedCertificates": {
+                "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Client/TrustedCertificates"
+            },
+            "RevokedCertificates": {
+                "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy/TLS/Client/RevokedCertificates"
+            },
+            "Allowed": {
+                "Versions": [
+                    "1.3"
+                ],
+                "Algorithms": {
+                    "CipherSuites": [
+                        "TLS_AES_128_GCM_SHA256",
+                        "TLS_AES_128_GCM_SHA384"
+                    ],
+                    "SignatureAlgorithms": []
+                }
+            },
+            "Denied": {
+                "Versions": [
+                    "1.1",
+                    "1.2"
+                ],
+                "Algorithms": {
+                    "CipherSuites": [],
+                    "SignatureAlgorithms": [
+                        "rsa_pkcs1_sha1",
+                        "ecdsa_sha1"
+                    ]
+                }
+            }
+        }
+    },
+    "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SerialInterfaces/TTY0/index.json b/public-rackmount1/Managers/BMC/SerialInterfaces/TTY0/index.json
index 11f7304..b57f4d2 100644
--- a/public-rackmount1/Managers/BMC/SerialInterfaces/TTY0/index.json
+++ b/public-rackmount1/Managers/BMC/SerialInterfaces/TTY0/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#SerialInterface.v1_1_5.SerialInterface",
+    "@odata.type": "#SerialInterface.v1_1_8.SerialInterface",
     "Id": "TTY0",
     "Name": "Manager Serial Interface 1",
     "Description": "Management for Serial Interface",
@@ -13,5 +13,5 @@
     "ConnectorType": "RJ45",
     "PinOut": "Cyclades",
     "@odata.id": "/redfish/v1/Managers/BMC/SerialInterfaces/TTY0",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/SerialInterfaces/index.json b/public-rackmount1/Managers/BMC/SerialInterfaces/index.json
index 7a2b6a9..bd40992 100644
--- a/public-rackmount1/Managers/BMC/SerialInterfaces/index.json
+++ b/public-rackmount1/Managers/BMC/SerialInterfaces/index.json
@@ -10,5 +10,5 @@
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/Managers/BMC/SerialInterfaces",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/VirtualMedia/index.json b/public-rackmount1/Managers/BMC/VirtualMedia/index.json
deleted file mode 100644
index 6fd5d06..0000000
--- a/public-rackmount1/Managers/BMC/VirtualMedia/index.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "@odata.type": "#VirtualMediaCollection.VirtualMediaCollection",
-    "Name": "Virtual Media Services",
-    "Description": "Redfish-BMC Virtual Media Service Settings",
-    "Members@odata.count": 2,
-    "Members": [
-        {
-            "@odata.id": "/redfish/v1/Managers/BMC/VirtualMedia/Floppy1"
-        },
-        {
-            "@odata.id": "/redfish/v1/Managers/BMC/VirtualMedia/CD1"
-        }
-    ],
-    "Oem": {},
-    "@odata.id": "/redfish/v1/Managers/BMC/VirtualMedia",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
diff --git a/public-rackmount1/Managers/BMC/index.json b/public-rackmount1/Managers/BMC/index.json
index 5f5e0ab..1cbbd22 100644
--- a/public-rackmount1/Managers/BMC/index.json
+++ b/public-rackmount1/Managers/BMC/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Manager.v1_7_0.Manager",
+    "@odata.type": "#Manager.v1_17_0.Manager",
     "Id": "BMC",
     "Name": "Manager",
     "ManagerType": "BMC",
@@ -39,20 +39,36 @@
         ]
     },
     "FirmwareVersion": "1.45.455b66-rev4",
+    "AdditionalFirmwareVersions": {
+        "Bootloader": "v2022.01",
+        "Kernel": "Linux 5.13.0-30-generic arm71",
+        "Oem": {
+            "Contoso": {
+                "@odata.type": "#ContosoSoftwareInventory.v1_0_0.AdditionalVersions",
+                "ManagementApp": "1.30"
+            }
+        }
+    },
     "NetworkProtocol": {
         "@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol"
     },
     "EthernetInterfaces": {
         "@odata.id": "/redfish/v1/Managers/BMC/EthernetInterfaces"
     },
+    "HostInterfaces": {
+        "@odata.id": "/redfish/v1/Managers/BMC/HostInterfaces"
+    },
     "SerialInterfaces": {
         "@odata.id": "/redfish/v1/Managers/BMC/SerialInterfaces"
     },
     "LogServices": {
         "@odata.id": "/redfish/v1/Managers/BMC/LogServices"
     },
-    "VirtualMedia": {
-        "@odata.id": "/redfish/v1/Managers/BMC/VirtualMedia"
+    "DedicatedNetworkPorts": {
+        "@odata.id": "/redfish/v1/Managers/BMC/DedicatedNetworkPorts"
+    },
+    "SecurityPolicy": {
+        "@odata.id": "/redfish/v1/Managers/BMC/SecurityPolicy"
     },
     "Links": {
         "ManagerForServers": [
@@ -82,5 +98,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/Managers/BMC",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/index.json b/public-rackmount1/Managers/index.json
index 3ffc326..197d6e4 100644
--- a/public-rackmount1/Managers/index.json
+++ b/public-rackmount1/Managers/index.json
@@ -9,5 +9,5 @@
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/Managers",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Registries/Base.1.5.0/index.json b/public-rackmount1/Registries/Base.1.5.0/index.json
index 2f85c60..d25601a 100644
--- a/public-rackmount1/Registries/Base.1.5.0/index.json
+++ b/public-rackmount1/Registries/Base.1.5.0/index.json
@@ -1,6 +1,4 @@
 {
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. All rights reserved.",
-    "@odata.id": "/redfish/v1/Registries/Base.1.5.0",
     "@odata.type": "#MessageRegistryFile.v1_1_3.MessageRegistryFile",
     "Id": "Base.1.5.0",
     "Name": "Base Message Registry File",
@@ -16,5 +14,7 @@
             "Uri": "/redfish/v1/Registries/Base.1.5.0.json"
         }
     ],
-    "Oem": {}
-}
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Registries/Base.1.5.0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Registries/index.json b/public-rackmount1/Registries/index.json
index 9a3a9a3..3a3ee77 100644
--- a/public-rackmount1/Registries/index.json
+++ b/public-rackmount1/Registries/index.json
@@ -1,6 +1,4 @@
 {
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. All rights reserved.",
-    "@odata.id": "/redfish/v1/Registries",
     "@odata.type": "#MessageRegistryFileCollection.MessageRegistryFileCollection",
     "Name": "Registry File Collection",
     "Description": "Registry Repository",
@@ -9,5 +7,7 @@
         {
             "@odata.id": "/redfish/v1/Registries/Base.1.5.0"
         }
-    ]
-}
+    ],
+    "@odata.id": "/redfish/v1/Registries",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/SessionService/Sessions/1234567890ABCDEF/index.json b/public-rackmount1/SessionService/Sessions/1234567890ABCDEF/index.json
index 5394b43..ac01070 100644
--- a/public-rackmount1/SessionService/Sessions/1234567890ABCDEF/index.json
+++ b/public-rackmount1/SessionService/Sessions/1234567890ABCDEF/index.json
@@ -1,10 +1,10 @@
 {
-    "@odata.type": "#Session.v1_2_1.Session",
+    "@odata.type": "#Session.v1_6_0.Session",
     "Id": "1234567890ABCDEF",
     "Name": "User Session",
     "Description": "Manager User Session",
     "UserName": "Administrator",
     "Oem": {},
     "@odata.id": "/redfish/v1/SessionService/Sessions/1234567890ABCDEF",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/SessionService/Sessions/index.json b/public-rackmount1/SessionService/Sessions/index.json
index be4a47e..71e1c11 100644
--- a/public-rackmount1/SessionService/Sessions/index.json
+++ b/public-rackmount1/SessionService/Sessions/index.json
@@ -8,5 +8,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/SessionService/Sessions",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/SessionService/index.json b/public-rackmount1/SessionService/index.json
index 7fc658c..b518b1d 100644
--- a/public-rackmount1/SessionService/index.json
+++ b/public-rackmount1/SessionService/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#SessionService.v1_1_6.SessionService",
+    "@odata.type": "#SessionService.v1_1_8.SessionService",
     "Id": "SessionService",
     "Name": "Session Service",
     "Description": "Session Service",
@@ -13,5 +13,5 @@
         "@odata.id": "/redfish/v1/SessionService/Sessions"
     },
     "@odata.id": "/redfish/v1/SessionService",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Bios/Settings/index.json b/public-rackmount1/Systems/437XR1138R2/Bios/Settings/index.json
index 28be476..3508d97 100644
--- a/public-rackmount1/Systems/437XR1138R2/Bios/Settings/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Bios/Settings/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Bios.v1_1_0.Bios",
+    "@odata.type": "#Bios.v1_2_0.Bios",
     "Id": "Settings",
     "Name": "BIOS Configuration Pending Settings",
     "AttributeRegistry": "BiosAttributeRegistryP89.v1_0_0",
@@ -16,5 +16,5 @@
         "UsbControl": "UsbEnabled"
     },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Bios/Settings",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Bios/index.json b/public-rackmount1/Systems/437XR1138R2/Bios/index.json
index 4490097..9f2b2e0 100644
--- a/public-rackmount1/Systems/437XR1138R2/Bios/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Bios/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Bios.v1_1_0.Bios",
+    "@odata.type": "#Bios.v1_2_0.Bios",
     "Id": "Bios",
     "Name": "BIOS Configuration Current Settings",
     "AttributeRegistry": "BiosAttributeRegistryP89.v1_0_0",
@@ -15,14 +15,15 @@
         "ProcTurboMode": "Enabled",
         "UsbControl": "UsbEnabled"
     },
+    "ResetBiosToDefaultsPending": true,
     "@Redfish.Settings": {
-        "@odata.type": "#Settings.v1_3_0.Settings",
+        "@odata.type": "#Settings.v1_3_5.Settings",
         "ETag": "9234ac83b9700123cc32",
         "Messages": [
             {
                 "MessageId": "Base.1.0.SettingsFailed",
                 "RelatedProperties": [
-                    "#/Attributes/ProcTurboMode"
+                    "/Attributes/ProcTurboMode"
                 ]
             }
         ],
@@ -40,5 +41,5 @@
         }
     },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Bios",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Certificates/contoso-root/index.json b/public-rackmount1/Systems/437XR1138R2/Certificates/contoso-root/index.json
new file mode 100644
index 0000000..308f883
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/Certificates/contoso-root/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "contoso-root",
+    "Name": "Contoso Root CA",
+    "CertificateType": "PEM",
+    "Links": {
+        "Subjects": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates/contoso-subca"
+            }
+        ]
+    },
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIFPjCCAyYCCQCSFsIudUer0DANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJV\nUzEQMA4GA1UECAwHUmVkZmlzaDEbMBkGA1UEBwwSTm90LUhlcmUtTm90LVRoZXJl\nMRAwDgYDVQQKDAdDb250b3NvMRAwDgYDVQQLDAdSZWRmaXNoMCAXDTIxMTAwNzE4\nNTkwN1oYDzIwOTkxMDA4MTg1OTA3WjBgMQswCQYDVQQGEwJVUzEQMA4GA1UECAwH\nUmVkZmlzaDEbMBkGA1UEBwwSTm90LUhlcmUtTm90LVRoZXJlMRAwDgYDVQQKDAdD\nb250b3NvMRAwDgYDVQQLDAdSZWRmaXNoMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A\nMIICCgKCAgEAwK877tRnOqMACIu/fpN1BD0nZWhy0l5s/gtcuGTM3WhlvQr1/j1D\nj5J8/gCFWNWtGNlLUNdqCUgE/Mki4zdkc4RGqlW9SpdIq+3Wn/lnNmTzjWPfsNaM\n7GMW+gYxDuQf/Pw/h6qXMBZ6JIy/ilAwzV6qJCuJhmSm6O9V+KENoKPWNUYyWnsb\nEJdTYmf58opMgSxdi032hML5gAdMWlIXQcQjX0crr0Ey9VC5WyDSm9/SKY9x6uMM\nTEGBl5NAFa3J05AGrmsgpA8QU4WzKe77DqWeTx9ZKHkqqRUK0onbXGDL8KDOXJr8\nvQSFgiAa3bnVNhUjsDik0xq2QrmHcy72i9xd9AlH3yC/2EMNHnVeJ8Sbhz9rHaSj\nPVxXvorMM650ZDCocVgIBqf3TwxDzC+aBRkXQVLadvnwpg54AHKoIGA0djvROgrZ\nZp7Au+wxy6OzYT6+hGe3I7mPPmRgz9D1BV9M4QdvbKVJPSMcWIEEd6ENrXP97H4j\ngpvql+zTJcZ5kF/RwVLRwxIPyN49gwJP8MMdWp+jvItO8obmdDLZFhGXyF5f19jt\nMWCHybucvLJml7jFJYqNqi5rr1ShAYdV9WbS3hYfBz1xytYP0Rb/5xaBFMvRUBzt\nvU8V1AOLNb8TfbNaqZx1XJTL1NhrKebtBSAtRRcTiD8p8wmDjSZcV0cCAwEAATAN\nBgkqhkiG9w0BAQsFAAOCAgEAOABtLDFso1UBwas4l+LZt0f2OxJWMRNLtNDwOy22\na3diIO3WaX6qD5oy9aj+cANZ15k1UZ3idW0hIVYvz5YESKqP8VW0QW2G/2fWGFlB\nRp+mfd0rW++2uFzKlQjfqRUllG17tfy+zUixWubgkqL39/FFRP0HRUt9cm9qfXys\nvM0VzlXxrlP0Y00onXoqlvGRcmSUOU+Kt5KJkXSSaGAfouPpWEU6qwl+qTAqHMf7\nAXhcsHEFJZe+iVr2cR5GTjGiNbQG0bjgnuSRHCFR9+E8mOoiVfZ5cRy4njGkSUi0\nD/KCpoIiSrxqyaHeSyFA81q8Co2aELirS8bpg38b3IZW6U7ITZH/IcvqBCvpOdXi\n43vVgruJlclqtjoPMYQLTbP2bsiNRdqG+xQF2jOVqrN3Kpmvm+4HDaKUN4TlPVOs\n25z7JTGn0i6fSlv7Gg+4Cox0FPrbSmX1OON61pDGfUJs343EBQ0AQwU4qVYkWFqb\nMd1/YMhYIJVRsIX8XXF7hSmA614um+vvc8TlfJwfUIl54I9m8Uu11GeUceL1Ts75\n97yFurEMLmR9sJSzuM3Sez96LNb0LeYwJRdpI6ttc2/v8hfRXOlRPRJAoJkdRQDh\nH++X8r/eTIWoZT/vOAY+CdFsJ10MCcjndA4AwDmQ1AWXvbuFV5ByO53mjNn4xRpu\nwUo=\n-----END CERTIFICATE-----",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Certificates/contoso-subca/index.json b/public-rackmount1/Systems/437XR1138R2/Certificates/contoso-subca/index.json
new file mode 100644
index 0000000..463317a
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/Certificates/contoso-subca/index.json
@@ -0,0 +1,25 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "SScert",
+    "Name": "Contoso Intermediate CA - Level 1",
+    "CertificateType": "PEM",
+    "Links": {
+        "Issuer": {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates/contoso-root"
+        },
+        "Subjects": [
+            {
+                "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/AC-RoT0/Certificates/DeviceCert"
+            },
+            {
+                "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/iRoT0/Certificates/DeviceCert"
+            },
+            {
+                "@odata.id": "/redfish/v1/Chassis/1U/TrustedComponents/TPM/Certificates/EKCert"
+            }
+        ]
+    },
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIFFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQ0FADBgMQswCQYDVQQGEwJVUzEQ\nMA4GA1UECAwHUmVkZmlzaDEbMBkGA1UEBwwSTm90LUhlcmUtTm90LVRoZXJlMRAw\nDgYDVQQKDAdDb250b3NvMRAwDgYDVQQLDAdSZWRmaXNoMCAXDTIxMTAwNzE5Mzcx\nNFoYDzIwOTkxMDA4MTkzNzE0WjCBgDELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB1Jl\nZGZpc2gxHDAaBgNVBAcME1NvbWV3aGVyZSBJbmJldHdlZW4xEDAOBgNVBAoMB0Nv\nbnRvc28xEDAOBgNVBAsMB01vY2t1cHMxHTAbBgNVBAMMFENlcnRpZmljYXRlIERp\ndmlzaW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAywVlS8JJShc/\n81nnNBVMlv2jZvwUGWET2pRzayBsDSuotCuHFRexslsHZhHZygIGn6JTxlw24Bt7\nB4NVHrwCfy+yMPbcqo3fyaNz7bEWBHfzh4vbSqwvfd8A0N8z/Nz6nXcUFM1o5ajI\nN8pVODJZsS4oXDFi0BEyto4EEYGpZgGwi/S9k+vi3BDS5Fplo9RGuCcVnf7Iq6RL\nlU/uu6+sleBfjKPty8VIOnLX+4YuA32BPZjbeBnsdDHq1cu0QTGWQLXQisC8TPYt\n1lRkiNqD7/4E8k07SRHPs/XxWLIqZKDQe4XQC1I0CkEyOceW7BWp3/Z2kXJT4zR/\nLZunbX3FsQIDAQABo4G2MIGzMB0GA1UdDgQWBBT80CP8NbbpE4mJBHH3G8TCEMk3\nFjB6BgNVHSMEczBxoWSkYjBgMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHUmVkZmlz\naDEbMBkGA1UEBwwSTm90LUhlcmUtTm90LVRoZXJlMRAwDgYDVQQKDAdDb250b3Nv\nMRAwDgYDVQQLDAdSZWRmaXNoggkAkhbCLnVHq9AwCQYDVR0TBAIwADALBgNVHQ8E\nBAMCBaAwDQYJKoZIhvcNAQENBQADggIBABMdLmvS2fjYhlJGBIfmht5HDL829ORG\n4LnLqtDOzY4LkWE9ri14unaWmqeD0tfq5cy2un9C30LFvwMxb0O+UlLdpcuxR74B\n8Oq97VCRiwdlVt4YxWRxfVbA9D/YjOZFjumnHebMz6EOpl0HgsaQ95QmF8Hdb6Wg\n6j0m/7WZFED3thfw2SAel+B/OlJkUSN4zsPC2w2e7Gy4VpSpP8BYvsnQ9nE6TEyA\nOCj1VNQJsVGqu1g21CStDWOb6mqQDM8Ns1VMrHKRbZQRaugdvrRtTJ74wnV+YOFl\n/IhM5JIDs2cyiM4NepMfIzbgQG28IyuP8l4U7y+cZCf7p5+SWJgfzCQOMVGZhgsI\n8pKZqWIRmwl+nLFAXAa+RDcyI8DWh2y01Jk+7+9QgWhfvmFsPm7/qTOEhi79PU9H\nIAMkL9Xi1OcPEeAMk4Xfh578e0Xleq2cZVtYxZl71HJ0s39huyVNSKbsljA9S2rv\nSgczNruYDIIjniTkbWkebY1kbPBTjbSOUS1WT60iFRFgNbJ06gpz3yCpMnny7vVg\nVMPUq1m9AfVw3s6x1db3B0TCoNLUK16bmterp0CZe69azzK111scNlM0jFV0R2Kl\nsIZ5E0vmKzfg2XAgEY0rb7S0O363ASINOgAQSJVB9aXkJeNt68SC0UsTwy6x0ikX\n4kvr+YAqTSOA\n-----END CERTIFICATE-----",
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates/contoso-subca",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/Certificates/index.json
new file mode 100644
index 0000000..40663bf
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/Certificates/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificates Collection",
+    "Members@odata.count": 3,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates/contoso-root"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates/contoso-subca"
+        }
+    ],
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/1/index.json b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/1/index.json
deleted file mode 100644
index 4f4adc2..0000000
--- a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/1/index.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "@odata.type": "#VLanNetworkInterface.v1_1_4.VLanNetworkInterface",
-    "Id": "1",
-    "Name": "VLAN Network Interface",
-    "Description": "System NIC 1 VLAN",
-    "VLANEnable": true,
-    "VLANId": 101,
-    "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
diff --git a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/2/index.json b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/2/index.json
deleted file mode 100644
index 15ae601..0000000
--- a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/2/index.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "@odata.type": "#VLanNetworkInterface.v1_1_4.VLanNetworkInterface",
-    "Id": "2",
-    "Name": "VLAN Network Interface",
-    "Description": "System NIC 1 VLAN",
-    "VLANEnable": true,
-    "VLANId": 199,
-    "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/2",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
diff --git a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/index.json b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/index.json
deleted file mode 100644
index acad2b5..0000000
--- a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/index.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "@odata.type": "#VLanNetworkInterfaceCollection.VLanNetworkInterfaceCollection",
-    "Name": "VLAN Network Interface Collection",
-    "Members@odata.count": 2,
-    "Members": [
-        {
-            "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/1"
-        },
-        {
-            "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs/2"
-        }
-    ],
-    "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
diff --git a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/index.json b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/index.json
index e657d13..b0c561e 100644
--- a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/index.json
@@ -1,12 +1,13 @@
 {
-    "@odata.type": "#EthernetInterface.v1_5_1.EthernetInterface",
-    "Id": "1",
+    "@odata.type": "#EthernetInterface.v1_9_0.EthernetInterface",
+    "Id": "12446A3B0411",
     "Name": "Ethernet Interface",
     "Description": "System NIC 1",
     "Status": {
         "State": "Enabled",
         "Health": "OK"
     },
+    "EthernetInterfaceType": "Physical",
     "LinkStatus": "LinkUp",
     "PermanentMACAddress": "12:44:6A:3B:04:11",
     "MACAddress": "12:44:6A:3B:04:11",
@@ -34,9 +35,11 @@
             "AddressState": "Preferred"
         }
     ],
-    "VLANs": {
-        "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411/VLANs"
+    "VLAN": {
+        "VLANEnable": false,
+        "VLANId": 101
     },
+    "TeamMode": "None",
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B8890/index.json b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B8890/index.json
index 51353c5..a54d0c2 100644
--- a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B8890/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/12446A3B8890/index.json
@@ -1,12 +1,13 @@
 {
-    "@odata.type": "#EthernetInterface.v1_5_1.EthernetInterface",
-    "Id": "2",
+    "@odata.type": "#EthernetInterface.v1_9_0.EthernetInterface",
+    "Id": "12446A3B8890",
     "Name": "Ethernet Interface",
     "Description": "System NIC 2",
     "Status": {
         "State": "Enabled",
         "Health": "OK"
     },
+    "EthernetInterfaceType": "Physical",
     "LinkStatus": "LinkUp",
     "PermanentMACAddress": "12:44:6A:3B:88:90",
     "MACAddress": "AA:BB:CC:DD:EE:00",
@@ -38,6 +39,7 @@
         "VLANEnable": true,
         "VLANId": 101
     },
+    "TeamMode": "None",
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B8890",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/ToManager/index.json b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/ToManager/index.json
new file mode 100644
index 0000000..ababdfd
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/ToManager/index.json
@@ -0,0 +1,55 @@
+{
+    "@odata.type": "#EthernetInterface.v1_9_0.EthernetInterface",
+    "Id": "ToManager",
+    "Name": "Host Ethernet Interface",
+    "Description": "Host Network Interface",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "InterfaceEnabled": true,
+    "PermanentMACAddress": "AA:BB:CC:DD:EE:FE",
+    "MACAddress": "AA:BB:CC:DD:EE:FE",
+    "SpeedMbps": 100,
+    "AutoNeg": true,
+    "FullDuplex": true,
+    "MTUSize": 1500,
+    "MaxIPv6StaticAddresses": 1,
+    "IPv4Addresses": [
+        {
+            "Address": "192.168.20.56",
+            "SubnetMask": "255.255.255.0",
+            "AddressOrigin": "Static",
+            "Gateway": "192.168.20.1"
+        }
+    ],
+    "IPv6AddressPolicyTable": [
+        {
+            "Prefix": "::1/128",
+            "Precedence": 50,
+            "Label": 0
+        }
+    ],
+    "IPv6StaticAddresses": [
+        {
+            "Address": "fe80::1ec1:deff:fe6f:1e25",
+            "PrefixLength": 64
+        }
+    ],
+    "IPv6DefaultGateway": "fe80::1ec1:deff:fe6f:1e24",
+    "IPv6Addresses": [
+        {
+            "Address": "fe80::1ec1:deff:fe6f:1e25",
+            "PrefixLength": 64,
+            "AddressOrigin": "Static",
+            "AddressState": "Preferred"
+        }
+    ],
+    "Links": {
+        "HostInterface": {
+            "@odata.id": "/redfish/v1/Managers/BMC/HostInterfaces/1"
+        }
+    },
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/ToManager",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/VLAN1/index.json b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/VLAN1/index.json
new file mode 100644
index 0000000..4adc003
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/VLAN1/index.json
@@ -0,0 +1,52 @@
+{
+    "@odata.type": "#EthernetInterface.v1_9_0.EthernetInterface",
+    "Id": "VLAN1",
+    "Name": "Ethernet Interface",
+    "Description": "VLAN from System NIC 1",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "EthernetInterfaceType": "Virtual",
+    "LinkStatus": "LinkUp",
+    "PermanentMACAddress": "12:44:6A:3B:04:11",
+    "MACAddress": "12:44:6A:3B:04:11",
+    "SpeedMbps": 1000,
+    "FullDuplex": true,
+    "HostName": "web483",
+    "FQDN": "web483.contoso.com",
+    "IPv6DefaultGateway": "fe80::3ed9:2bff:fe34:600",
+    "NameServers": [
+        "names.contoso.com"
+    ],
+    "IPv4Addresses": [
+        {
+            "Address": "192.168.150.236",
+            "SubnetMask": "255.255.252.0",
+            "AddressOrigin": "Static",
+            "Gateway": "192.168.150.1"
+        }
+    ],
+    "IPv6Addresses": [
+        {
+            "Address": "fe80::1ec1:deff:fe6f:1e24",
+            "PrefixLength": 64,
+            "AddressOrigin": "Static",
+            "AddressState": "Preferred"
+        }
+    ],
+    "VLAN": {
+        "VLANEnable": true,
+        "VLANId": 1000
+    },
+    "TeamMode": "None",
+    "Links": {
+        "RelatedInterfaces": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411"
+            }
+        ]
+    },
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/VLAN1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/index.json b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/index.json
index 536069d..06acdf4 100644
--- a/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/EthernetInterfaces/index.json
@@ -2,16 +2,22 @@
     "@odata.type": "#EthernetInterfaceCollection.EthernetInterfaceCollection",
     "Name": "Ethernet Interface Collection",
     "Description": "System NICs on Contoso Servers",
-    "Members@odata.count": 2,
+    "Members@odata.count": 4,
     "Members": [
         {
             "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B0411"
         },
         {
             "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/12446A3B8890"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/VLAN1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces/ToManager"
         }
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/EthernetInterfaces",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports/DisplayPort/index.json b/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports/DisplayPort/index.json
new file mode 100644
index 0000000..edb62c1
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports/DisplayPort/index.json
@@ -0,0 +1,32 @@
+{
+    "@odata.type": "#Port.v1_8_0.Port",
+    "Id": "DisplayPort",
+    "Name": "Display Port",
+    "Description": "Display Port",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PortId": "1",
+    "PortProtocol": "DisplayPort",
+    "PortType": "BidirectionalPort",
+    "CurrentSpeedGbps": 21.6,
+    "Width": 4,
+    "MaxSpeedGbps": 32.4,
+    "CurrentProtocolVersion": "1.2",
+    "CapableProtocolVersions": [
+        "1.0",
+        "1.1",
+        "1.1a",
+        "1.2",
+        "1.2a",
+        "1.3"
+    ],
+    "Actions": {
+        "Oem": {}
+    },
+    "Links": {},
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports/DisplayPort",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports/index.json b/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports/index.json
new file mode 100644
index 0000000..9a5345e
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports/index.json
@@ -0,0 +1,14 @@
+{
+    "@odata.type": "#PortCollection.PortCollection",
+    "Name": "Port Collection",
+    "Description": "GPU Port Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports/DisplayPort"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/index.json b/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/index.json
new file mode 100644
index 0000000..4df5543
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/GPU1/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#GraphicsController.v1_0_0.GraphicsController",
+    "Id": "GPU1",
+    "Name": "Contoso Graphics Controller 1",
+    "AssetTag": "",
+    "Manufacturer": "Contoso",
+    "Model": "GPU1",
+    "SKU": "80937",
+    "SerialNumber": "2M220100SL",
+    "PartNumber": "G37891",
+    "SparePartNumber": "G37890",
+    "BiosVersion": "90.02.17.00.7D",
+    "DriverVersion": "27.21.14.6079 (Contoso 460.79) DCH / Win 10 64",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "Slot 1",
+            "LocationOrdinalValue": 1,
+            "LocationType": "Slot",
+            "Orientation": "LeftToRight",
+            "Reference": "Rear"
+        }
+    },
+    "Ports": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/GraphicsControllers/GPU1/Ports"
+    },
+    "Links": {},
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/GraphicsControllers/GPU1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/index.json b/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/index.json
new file mode 100644
index 0000000..7011ece
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/GraphicsControllers/index.json
@@ -0,0 +1,14 @@
+{
+    "@odata.type": "#GraphicsControllerCollection.GraphicsControllerCollection",
+    "Name": "GraphicsControllers",
+    "Description": "Redfish Graphics Controllers",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/GraphicsControllers/GPU1"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/GraphicsControllers",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/1/index.json b/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/1/index.json
index 6893fd8..4d305af 100644
--- a/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/1/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#LogEntry.v1_5_1.LogEntry",
+    "@odata.type": "#LogEntry.v1_14_0.LogEntry",
     "Id": "1",
     "Name": "Log Entry 1",
     "EntryType": "SEL",
@@ -18,5 +18,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices/Log1/Entries/1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/2/index.json b/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/2/index.json
index d0dd6a5..64755f4 100644
--- a/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/2/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/2/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#LogEntry.v1_5_1.LogEntry",
+    "@odata.type": "#LogEntry.v1_14_0.LogEntry",
     "Id": "2",
     "Name": "Log Entry 2",
     "EntryType": "SEL",
@@ -18,5 +18,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices/Log1/Entries/2",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/index.json b/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/index.json
index fcd4a65..a02c361 100644
--- a/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/Entries/index.json
@@ -6,7 +6,7 @@
     "Members": [
         {
             "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices/Log1/Entries/1",
-            "@odata.type": "#LogEntry.v1_5_1.LogEntry",
+            "@odata.type": "#LogEntry.v1_14_0.LogEntry",
             "Id": "1",
             "Name": "Log Entry 1",
             "EntryType": "SEL",
@@ -27,7 +27,7 @@
         },
         {
             "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices/Log1/Entries/2",
-            "@odata.type": "#LogEntry.v1_5_1.LogEntry",
+            "@odata.type": "#LogEntry.v1_14_0.LogEntry",
             "Id": "2",
             "Name": "Log Entry 2",
             "EntryType": "SEL",
@@ -49,5 +49,5 @@
     ],
     "@odata.nextLink": "/redfish/v1/Systems/437XR1138R2/LogServices/Log1/Entries?$skiptoken=2",
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices/Log1/Entries",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/index.json b/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/index.json
index ae0e1bf..cf12cd5 100644
--- a/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/LogServices/Log1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#LogService.v1_1_3.LogService",
+    "@odata.type": "#LogService.v1_4_0.LogService",
     "Id": "Log1",
     "Name": "System Log Service",
     "MaxNumberOfRecords": 1000,
@@ -22,5 +22,5 @@
         "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices/Log1/Entries"
     },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices/Log1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/LogServices/index.json b/public-rackmount1/Systems/437XR1138R2/LogServices/index.json
index 429aecf..14953d0 100644
--- a/public-rackmount1/Systems/437XR1138R2/LogServices/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/LogServices/index.json
@@ -10,5 +10,5 @@
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM1/EnvironmentMetrics/index.json b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM1/EnvironmentMetrics/index.json
new file mode 100644
index 0000000..3351b43
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM1/EnvironmentMetrics/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#EnvironmentMetrics.v1_3_0.EnvironmentMetrics",
+    "Id": "EnvironmentMetrics",
+    "Name": "Memory Environment Metrics",
+    "TemperatureCelsius": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/DIMM1Temp",
+        "Reading": 44
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM1/EnvironmentMetrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM1/index.json b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM1/index.json
index 6aa8422..0792175 100644
--- a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM1/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Memory.v1_9_0.Memory",
+    "@odata.type": "#Memory.v1_17_0.Memory",
     "Id": "DIMM1",
     "Name": "DIMM Slot 1",
     "RankCount": 2,
@@ -26,6 +26,9 @@
         "State": "Enabled",
         "Health": "OK"
     },
+    "EnvironmentMetrics": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM1/EnvironmentMetrics"
+    },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM2/EnvironmentMetrics/index.json b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM2/EnvironmentMetrics/index.json
new file mode 100644
index 0000000..efe6817
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM2/EnvironmentMetrics/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#EnvironmentMetrics.v1_3_0.EnvironmentMetrics",
+    "Id": "EnvironmentMetrics",
+    "Name": "Memory Environment Metrics",
+    "TemperatureCelsius": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/DIMM1Temp",
+        "Reading": 44
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM2/EnvironmentMetrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM2/index.json b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM2/index.json
index 8a6a377..3c6f0d5 100644
--- a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM2/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM2/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Memory.v1_9_0.Memory",
+    "@odata.type": "#Memory.v1_17_0.Memory",
     "Id": "DIMM2",
     "Name": "DIMM Slot 2",
     "RankCount": 2,
@@ -26,6 +26,9 @@
         "State": "Enabled",
         "Health": "OK"
     },
+    "EnvironmentMetrics": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM2/EnvironmentMetrics"
+    },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM2",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM3/EnvironmentMetrics/index.json b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM3/EnvironmentMetrics/index.json
new file mode 100644
index 0000000..83ebf71
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM3/EnvironmentMetrics/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#EnvironmentMetrics.v1_3_0.EnvironmentMetrics",
+    "Id": "EnvironmentMetrics",
+    "Name": "Memory Environment Metrics",
+    "TemperatureCelsius": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/DIMM1Temp",
+        "Reading": 44
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM3/EnvironmentMetrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM3/index.json b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM3/index.json
index 9296a6a..217ad1d 100644
--- a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM3/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM3/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Memory.v1_9_0.Memory",
+    "@odata.type": "#Memory.v1_17_0.Memory",
     "Id": "DIMM3",
     "Name": "DIMM Slot 3",
     "RankCount": 2,
@@ -26,6 +26,9 @@
         "State": "Enabled",
         "Health": "OK"
     },
-    "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM2",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "EnvironmentMetrics": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM3/EnvironmentMetrics"
+    },
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM3",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM4/index.json b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM4/index.json
index 49550e5..69e1481 100644
--- a/public-rackmount1/Systems/437XR1138R2/Memory/DIMM4/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Memory/DIMM4/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Memory.v1_9_0.Memory",
+    "@odata.type": "#Memory.v1_17_0.Memory",
     "Id": "DIMM4",
     "Name": "DIMM Slot 4",
     "MemoryLocation": {
@@ -12,5 +12,5 @@
         "State": "Absent"
     },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory/DIMM4",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Memory/index.json b/public-rackmount1/Systems/437XR1138R2/Memory/index.json
index f36b774..6180cac 100644
--- a/public-rackmount1/Systems/437XR1138R2/Memory/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Memory/index.json
@@ -17,5 +17,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Memory",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Processors/CPU1/EnvironmentMetrics/index.json b/public-rackmount1/Systems/437XR1138R2/Processors/CPU1/EnvironmentMetrics/index.json
new file mode 100644
index 0000000..747aec5
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/Processors/CPU1/EnvironmentMetrics/index.json
@@ -0,0 +1,23 @@
+{
+    "@odata.type": "#EnvironmentMetrics.v1_3_0.EnvironmentMetrics",
+    "Id": "EnvironmentMetrics",
+    "Name": "Processor Environment Metrics",
+    "TemperatureCelsius": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/CPU1Temp",
+        "Reading": 44
+    },
+    "PowerWatts": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/CPU1Power",
+        "Reading": 12.87
+    },
+    "FanSpeedsPercent": [
+        {
+            "DataSourceUri": "/redfish/v1/Chassis/1U/Sensors/CPUFan1",
+            "DeviceName": "CPU #1 Fan Speed",
+            "Reading": 80
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1/EnvironmentMetrics",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Processors/CPU1/index.json b/public-rackmount1/Systems/437XR1138R2/Processors/CPU1/index.json
index d5ee490..0a51f80 100644
--- a/public-rackmount1/Systems/437XR1138R2/Processors/CPU1/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Processors/CPU1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Processor.v1_7_0.Processor",
+    "@odata.type": "#Processor.v1_17_0.Processor",
     "Id": "CPU1",
     "Name": "Processor",
     "Socket": "CPU 1",
@@ -16,13 +16,28 @@
         "Step": "0x1",
         "MicrocodeInfo": "0x429943"
     },
+    "AdditionalFirmwareVersions": {
+        "Microcode": "0x46"
+    },
     "MaxSpeedMHz": 3700,
+    "OperatingSpeedMHz": 2333,
+    "OperatingSpeedRangeMHz": {
+        "DataSourceUri": "/redfish/v1/Chassis/1U/Controls/CPU1Freq",
+        "ControlMode": "Automatic",
+        "AllowableMin": 1200,
+        "SettingMin": 2000,
+        "SettingMax": 2400,
+        "AllowableMax": 3700
+    },
     "TotalCores": 8,
     "TotalThreads": 16,
     "Status": {
         "State": "Enabled",
         "Health": "OK"
     },
+    "EnvironmentMetrics": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1/EnvironmentMetrics"
+    },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Processors/CPU2/index.json b/public-rackmount1/Systems/437XR1138R2/Processors/CPU2/index.json
index c6a13aa..ef86989 100644
--- a/public-rackmount1/Systems/437XR1138R2/Processors/CPU2/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Processors/CPU2/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Processor.v1_7_0.Processor",
+    "@odata.type": "#Processor.v1_17_0.Processor",
     "Id": "CPU2",
     "Name": "Processor",
     "Socket": "CPU 2",
@@ -8,5 +8,5 @@
         "State": "Absent"
     },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU2",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/Compression/index.json b/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/Compression/index.json
index a980d19..5607e3c 100644
--- a/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/Compression/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/Compression/index.json
@@ -1,12 +1,12 @@
 {
-    "@odata.type": "#AccelerationFunction.v1_0_2.AccelerationFunction",
+    "@odata.type": "#AccelerationFunction.v1_0_3.AccelerationFunction",
     "Id": "Compression",
     "Name": "Compression Accelerator",
     "Description": "Compression Acceleration Function",
     "Status": {
         "State": "Enabled",
         "Health": "OK",
-        "HealthRollup": null
+        "HealthRollup": "OK"
     },
     "UUID": "00000000-0000-0000-0000-000000000000",
     "FpgaReconfigurationSlots": [
@@ -22,5 +22,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/Compression",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/index.json b/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/index.json
index 7ec6101..458d2f1 100644
--- a/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions/index.json
@@ -8,5 +8,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/FPGA1/AccelerationFunctions",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/ProcessorMetrics/index.json b/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/ProcessorMetrics/index.json
index ddbce61..115aa66 100644
--- a/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/ProcessorMetrics/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/ProcessorMetrics/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#ProcessorMetrics.v1_0_2.ProcessorMetrics",
+    "@odata.type": "#ProcessorMetrics.v1_6_0.ProcessorMetrics",
     "Id": "Metrics",
     "Description": "Processor Metrics",
     "Name": "Processor Metrics",
@@ -66,5 +66,5 @@
     ],
     "Oem": {},
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/FPGA1/ProcessorMetrics",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/index.json b/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/index.json
index ef6f642..c5156d9 100644
--- a/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Processors/FPGA1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Processor.v1_7_0.Processor",
+    "@odata.type": "#Processor.v1_17_0.Processor",
     "Id": "FPGA1",
     "Name": "FPGA",
     "ProcessorType": "FPGA",
@@ -79,5 +79,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/FPGA1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/Processors/index.json b/public-rackmount1/Systems/437XR1138R2/Processors/index.json
index f1d57df..6e0d6bd 100644
--- a/public-rackmount1/Systems/437XR1138R2/Processors/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/Processors/index.json
@@ -14,5 +14,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/1/index.json
new file mode 100644
index 0000000..54b7661
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/1/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "1",
+    "Name": "Contoso KEK Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDbzCCAlegAwIBAgIUf2b1tKa8CXy2saePf6i1mIwnRTcwDQYJKoZIhvcNAQEL\nBQAwVzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo\nMQ8wDQYDVQQKEwZMZW5vdm8xGDAWBgNVBAMTD0xlbm92byBVRUZJIEtFSzAeFw0x\nNzA1MjcwMzU0NDJaFw00MTA1MjcwMzU0NDJaMFcxCzAJBgNVBAYTAlVTMQswCQYD\nVQQIEwJOQzEQMA4GA1UEBxMHUmFsZWlnaDEPMA0GA1UEChMGTGVub3ZvMRgwFgYD\nVQQDEw9MZW5vdm8gVUVGSSBLRUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\nAoIBAQDCu6lcSg/MmtcXRGPmxSaMRuFUa/Hoge40OnklJ936OYqPTTZGPZMld0mq\nzrfW/jZ7YYbtbS2vLTU4uzKo6YHRgp+IlAalmXZNh+D1MsJpJ1zqbxkcBW/ohPZY\nTgNPugYeVw+kbcunxQPqa6dvgidGu6qo3uLCJ0kWmZeCqGLgJ8NkKyGpiALALCcK\njVHNd87WUVnf9V1VsaeGytIOk42VbxBjuP1yS/nW1yJ+9wmftYtDy6/MuFT7DIM7\n1cVsRZGlM0WZbfVxHVAd8KGOvsXMOu7vgfKrLd/ZOWwtk+Iqthg23+Cc7aY2tc9q\nS1pa378idhbY8beJIyjCQgdheL8vAgMBAAGjMzAxMA8GA1UdEwEB/wQFMAMBAf8w\nDgYDVR0PAQH/BAQDAgIEMA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG9w0BAQsFAAOC\nAQEAtcTQVLt/t8ijoB6Na4pvdtG0c11ZG9vJvx0mZEgp30VUwgWPqnlAmkA5RNhh\nate/fGNvwAuyJZjiHJ4nqtJ9/pEDc+RMnPiGZDzKZcZlYiqOwod6nZklGw6X3f45\nxmiM+YYfeY1vlptTnm2FyuFtgqiJ6lAVJ4c17KyrsDBw79G/3hsB9H3E8YeyA0kq\nXELejPl9JSAEvY6+KtO/BFRR36Q1Xwz9lUWI+tLkAiOLIgLsJBu4ADX276pCGGTw\nIj9pRcFEjGwp3iwXid4323b36iLiUDyQTkBGjzZlIZekSS+BMEyZ9RKoIyrxyUjC\npmPlF6edID9hg2iv9pPjGfFfKQ==\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "KEK.contoso.org"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "Contoso UEFI KEK"
+    },
+    "ValidNotBefore": "2018-09-07T13:22:05Z",
+    "ValidNotAfter": "2041-09-07T13:22:05Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature",
+        "CRLSigning"
+    ],
+    "UefiSignatureOwner": "5491316d-9694-4639-b72d-b8630ffa7dab",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/2/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/2/index.json
new file mode 100644
index 0000000..c5c2b45
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/2/index.json
@@ -0,0 +1,32 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "2",
+    "Name": "Microsoft Corporation KEK Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDbzCCAlegAwIBAgIUf2b1tKa8CXy2shrPf6i1mIwnRTcwDQYJKoZIhvcNAQEL\nBQAwVzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo\nMQ8wDQYDVQQKEwZMZW5vdm8xGDAWBgNVBAMTD0xlbm92byBVRUZJIEtFSzAeFw0x\nNzA1MjcwMzU0NDJaFw00MTA1MjcwMzU0NDJaMFcxCzAJBgNVBAYTAlVTMQswCQYD\nVQQIEwJOQzEQMA4GA1UEBxMHUmFsZWlnaDEPMA0GA1UEChMGTGVub3ZvMRgwFgYD\nVQQDEw9MZW5vdm8gVUVGSSBLRUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\nAoIBAQDCu6lcSg/MmtcXRGPmxSaMRuFUa/Hoge40OnklJ936OYqPTTZGPZMld0mq\nzrfW/jZ7YYbtbS2vLTU4uzKo6YHRgp+IlAalmXZNh+D1MsJpJ1zqbxkcBW/ohPZY\nTgNPugYeVw+kbcunxQPqa6dvgidGu6qo3uLCJ0kWmZeCqGLgJ8NkKyGpiALALCcK\njVHNd87WUVnf9V1VsqRGytIOk42VbxBjuP1yS/nW1yJ+9wmftYtDy6/MuFT7DIM7\n1cVsRZGlM0WZbfVxHVAd8KGOvsXMOu7vgfKrLd/ZOWwtk+Iqthg23+Cc7aY2tc9q\nS1pa378idhbY8beJIyjCQgdheL8vAgMBAAGjMzAxMA8GA1UdEwEB/wQFMAMBAf8w\nDgYDVR0PAQH/BAQDAgIEMA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG9w0BAQsFAAOC\nAQEAtcTQVLt/t8ijoB6Na4pvdtG0c11ZG9vJvx0mZEgp30VUwgWPqnlAmkA5RNhh\nate/fGNvwAuyJZjiHJ4nqtJ9/pEDc+RMnPiGZDzKZcZlYiqOwod6nZklGw6X3f45\nxmiM+YYfeY1vlptTnm2FyuFtgqiJ6lAVJ4c17KyrsDBw79G/3hsB9H3E8YeyA0kq\nXELejPl9JSSCvY6+KtO/BFRR36Q1Xwz9lUWI+tLkAiOLIgLsJBu4ADX276pCGGTw\nIj9pRcFEjGwp3iwXid4323b36iLiUDyQTkBGjzZlIZekSS+BMEyZ9RKoIyrxyUjC\npmPlF6edID9hg2iv9pPjGfFfKQ==\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Washington",
+        "City": "Redmond",
+        "Organization": "Microsoft Corporation",
+        "CommonName": "Microsoft Corporation Third Party Marketplace Root"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Washington",
+        "City": "Redmond",
+        "Organization": "Microsoft Corporation",
+        "CommonName": "Microsoft Corporation KEK CA 2011"
+    },
+    "ValidNotBefore": "2011-06-24T13:41:29Z",
+    "ValidNotAfter": "2026-06-24T13:51:29Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature",
+        "CRLSigning"
+    ],
+    "UefiSignatureOwner": "77fa9abd-0359-4d32-bd60-28f4e78f784b",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/index.json
new file mode 100644
index 0000000..45c9430
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/2"
+        }
+    ],
+    "@Redfish.SupportedCertificates": [
+        "PEM"
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/index.json
new file mode 100644
index 0000000..5beb854
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/index.json
@@ -0,0 +1,23 @@
+{
+    "@odata.type": "#SecureBootDatabase.v1_0_1.SecureBootDatabase",
+    "Id": "KEK",
+    "Name": "KEK - Key Exchange Key Database",
+    "Description": "UEFI KEK Secure Boot Database",
+    "DatabaseId": "KEK",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Certificates/"
+    },
+    "Actions": {
+        "#SecureBootDatabase.ResetKeys": {
+            "target": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK/Actions/SecureBootDatabase.ResetKeys",
+            "ResetKeysType@Redfish.AllowableValues": [
+                "ResetAllKeysToDefault",
+                "DeleteAllKeys"
+            ]
+        },
+        "Oem": {}
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/1/index.json
new file mode 100644
index 0000000..1b505dc
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/1/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "1",
+    "Name": "Contoso KEK Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDbzCCAlegAwIBAgIUf2b1tKa8CXy2saePf6i1mIwnRTcwDQYJKoZIhvcNAQEL\nBQAwVzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo\nMQ8wDQYDVQQKEwZMZW5vdm8xGDAWBgNVBAMTD0xlbm92byBVRUZJIEtFSzAeFw0x\nNzA1MjcwMzU0NDJaFw00MTA1MjcwMzU0NDJaMFcxCzAJBgNVBAYTAlVTMQswCQYD\nVQQIEwJOQzEQMA4GA1UEBxMHUmFsZWlnaDEPMA0GA1UEChMGTGVub3ZvMRgwFgYD\nVQQDEw9MZW5vdm8gVUVGSSBLRUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\nAoIBAQDCu6lcSg/MmtcXRGPmxSaMRuFUa/Hoge40OnklJ936OYqPTTZGPZMld0mq\nzrfW/jZ7YYbtbS2vLTU4uzKo6YHRgp+IlAalmXZNh+D1MsJpJ1zqbxkcBW/ohPZY\nTgNPugYeVw+kbcunxQPqa6dvgidGu6qo3uLCJ0kWmZeCqGLgJ8NkKyGpiALALCcK\njVHNd87WUVnf9V1VsaeGytIOk42VbxBjuP1yS/nW1yJ+9wmftYtDy6/MuFT7DIM7\n1cVsRZGlM0WZbfVxHVAd8KGOvsXMOu7vgfKrLd/ZOWwtk+Iqthg23+Cc7aY2tc9q\nS1pa378idhbY8beJIyjCQgdheL8vAgMBAAGjMzAxMA8GA1UdEwEB/wQFMAMBAf8w\nDgYDVR0PAQH/BAQDAgIEMA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG9w0BAQsFAAOC\nAQEAtcTQVLt/t8ijoB6Na4pvdtG0c11ZG9vJvx0mZEgp30VUwgWPqnlAmkA5RNhh\nate/fGNvwAuyJZjiHJ4nqtJ9/pEDc+RMnPiGZDzKZcZlYiqOwod6nZklGw6X3f45\nxmiM+YYfeY1vlptTnm2FyuFtgqiJ6lAVJ4c17KyrsDBw79G/3hsB9H3E8YeyA0kq\nXELejPl9JSAEvY6+KtO/BFRR36Q1Xwz9lUWI+tLkAiOLIgLsJBu4ADX276pCGGTw\nIj9pRcFEjGwp3iwXid4323b36iLiUDyQTkBGjzZlIZekSS+BMEyZ9RKoIyrxyUjC\npmPlF6edID9hg2iv9pPjGfFfKQ==\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "KEK.contoso.org"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "Contoso UEFI KEK"
+    },
+    "ValidNotBefore": "2018-09-07T13:22:05Z",
+    "ValidNotAfter": "2041-09-07T13:22:05Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature",
+        "CRLSigning"
+    ],
+    "UefiSignatureOwner": "5491316d-9694-4639-b72d-b8630ffa7dab",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/2/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/2/index.json
new file mode 100644
index 0000000..87f4e87
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/2/index.json
@@ -0,0 +1,32 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "2",
+    "Name": "Microsoft Corporation KEK Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDbzCCAlegAwIBAgIUf2b1tKa8CXy2shrPf6i1mIwnRTcwDQYJKoZIhvcNAQEL\nBQAwVzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo\nMQ8wDQYDVQQKEwZMZW5vdm8xGDAWBgNVBAMTD0xlbm92byBVRUZJIEtFSzAeFw0x\nNzA1MjcwMzU0NDJaFw00MTA1MjcwMzU0NDJaMFcxCzAJBgNVBAYTAlVTMQswCQYD\nVQQIEwJOQzEQMA4GA1UEBxMHUmFsZWlnaDEPMA0GA1UEChMGTGVub3ZvMRgwFgYD\nVQQDEw9MZW5vdm8gVUVGSSBLRUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\nAoIBAQDCu6lcSg/MmtcXRGPmxSaMRuFUa/Hoge40OnklJ936OYqPTTZGPZMld0mq\nzrfW/jZ7YYbtbS2vLTU4uzKo6YHRgp+IlAalmXZNh+D1MsJpJ1zqbxkcBW/ohPZY\nTgNPugYeVw+kbcunxQPqa6dvgidGu6qo3uLCJ0kWmZeCqGLgJ8NkKyGpiALALCcK\njVHNd87WUVnf9V1VsqRGytIOk42VbxBjuP1yS/nW1yJ+9wmftYtDy6/MuFT7DIM7\n1cVsRZGlM0WZbfVxHVAd8KGOvsXMOu7vgfKrLd/ZOWwtk+Iqthg23+Cc7aY2tc9q\nS1pa378idhbY8beJIyjCQgdheL8vAgMBAAGjMzAxMA8GA1UdEwEB/wQFMAMBAf8w\nDgYDVR0PAQH/BAQDAgIEMA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG9w0BAQsFAAOC\nAQEAtcTQVLt/t8ijoB6Na4pvdtG0c11ZG9vJvx0mZEgp30VUwgWPqnlAmkA5RNhh\nate/fGNvwAuyJZjiHJ4nqtJ9/pEDc+RMnPiGZDzKZcZlYiqOwod6nZklGw6X3f45\nxmiM+YYfeY1vlptTnm2FyuFtgqiJ6lAVJ4c17KyrsDBw79G/3hsB9H3E8YeyA0kq\nXELejPl9JSSCvY6+KtO/BFRR36Q1Xwz9lUWI+tLkAiOLIgLsJBu4ADX276pCGGTw\nIj9pRcFEjGwp3iwXid4323b36iLiUDyQTkBGjzZlIZekSS+BMEyZ9RKoIyrxyUjC\npmPlF6edID9hg2iv9pPjGfFfKQ==\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Washington",
+        "City": "Redmond",
+        "Organization": "Microsoft Corporation",
+        "CommonName": "Microsoft Corporation Third Party Marketplace Root"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Washington",
+        "City": "Redmond",
+        "Organization": "Microsoft Corporation",
+        "CommonName": "Microsoft Corporation KEK CA 2011"
+    },
+    "ValidNotBefore": "2011-06-24T13:41:29Z",
+    "ValidNotAfter": "2026-06-24T13:51:29Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature",
+        "CRLSigning"
+    ],
+    "UefiSignatureOwner": "77fa9abd-0359-4d32-bd60-28f4e78f784b",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/index.json
new file mode 100644
index 0000000..f1b08f2
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/2"
+        }
+    ],
+    "@Redfish.SupportedCertificates": [
+        "PEM"
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/index.json
new file mode 100644
index 0000000..f3843ce
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#SecureBootDatabase.v1_0_1.SecureBootDatabase",
+    "Id": "KEKDefault",
+    "Name": "KEKDefault - Default Key Exchange Key Database",
+    "Description": "UEFI KEKDefault Secure Boot Database",
+    "DatabaseId": "KEKDefault",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault/Certificates/"
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/1/index.json
new file mode 100644
index 0000000..c254d6e
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/1/index.json
@@ -0,0 +1,33 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "1",
+    "Name": "PK Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDbTCCAlWgAwIBAgIUAZjZIHcy1np+3qP8RaHzTWaghuQwDQYJKoZIhvcNAQEL\nBQAwVjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo\nMQ8wDQYDVQQKEwZMZW5vdm8xFzAVBgNVBAMTDkxlbm92byBVRUZJIFBLMB4XDTE3\nMDUyNzAzNTMzN1oXDTQxMDUyNzAzNTMzN1owVjELMAkGA1UEBhMCVVMxCzAJBgNV\nBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdoMQ8wDQYDVQQKEwZMZW5vdm8xFzAVBgNV\nBAMTDkxlbm92byBVRUZJIFBLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\nAQEA62pJedCNMZbqqqOfvpQb091Ov1SUZaAhIZl1GsaeZ9P0xHH1H93UdQSTA918\nqSHIxp31WLHdI+LiYEnJbXZgnJ2RhEPVXE55VvzUTI6zEV5elo5adnxXmXH7oz6x\n35nIBYCKGayfM+jg/S1oJr5s5H9/67M88nijZS/8dDg29UTVcu+YM4IgbNhY48Gi\nrPG+iIQ4kh4PcdPY+SAEHIxD94HhlTQHnrLrWjF9hdepVty48KrqcQYfKmsUAJ6M\nzyxYIyIEJSG61Lv49DlbPppC7uVjVV+laPwJyzoqg5c1lkhz0HaODy0OI7i8gTiH\nAe2vGt6liKQbsDvXS/Xy8kmn8wIDAQABozMwMTAPBgNVHRMBAf8EBTADAQH/MA4G\nA1UdDwEB/wQEAwICBDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB\nAAl2n3X/rZSKQju2AbBcmuRnPUXwqih5Qql+oOYzsE3XaZC1vILAAJLBUcHvbGkL\n40JQ9NaUAzxsaeERoMl7vneyNTutY03tmIDdC0nYzN9eEZO0GSEAVKoxgxLZ+od3\na2yGZ9htjCvaqUNniOlXCKQ0T595Z24mwY20F/ras1j8WXAYjyiCBUDpWi70VAdB\n0aCpZzterITmo7ymx7zK2hHIaYbRlXIXLMesdfSS/4hSLR49SvfVbOcnajdfmcI/\nXIWNRE/Xvg17lrgjMZ0vdU4wCVe2sAh6ckB45tJM/v97ICCZZld0Ee8IH1ayabmo\njSgtuHs9sxviahyMDv3gEGk=\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "PK.contoso.org"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "Contoso UEFI PK"
+    },
+    "ValidNotBefore": "2018-09-07T13:22:05Z",
+    "ValidNotAfter": "2041-09-07T13:22:05Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature"
+    ],
+    "UefiSignatureOwner": "5491316d-9694-4639-b72d-b8630ffa7dab",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/index.json
new file mode 100644
index 0000000..babb201
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/index.json
@@ -0,0 +1,16 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/1"
+        }
+    ],
+    "@Redfish.SupportedCertificates": [
+        "PEM"
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/index.json
new file mode 100644
index 0000000..c83e4aa
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/index.json
@@ -0,0 +1,23 @@
+{
+    "@odata.type": "#SecureBootDatabase.v1_0_1.SecureBootDatabase",
+    "Id": "PK",
+    "Name": "PK - Platform Key",
+    "Description": "UEFI PK Secure Boot Database",
+    "DatabaseId": "PK",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Certificates/"
+    },
+    "Actions": {
+        "#SecureBootDatabase.ResetKeys": {
+            "target": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK/Actions/SecureBootDatabase.ResetKeys",
+            "ResetKeysType@Redfish.AllowableValues": [
+                "ResetAllKeysToDefault",
+                "DeleteAllKeys"
+            ]
+        },
+        "Oem": {}
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/1/index.json
new file mode 100644
index 0000000..8162a53
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/1/index.json
@@ -0,0 +1,33 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "1",
+    "Name": "PKDefault Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDbTCCAlWgAwIBAgIUAZjZIHcy1np+3qP8RaHzTWaghuQwDQYJKoZIhvcNAQEL\nBQAwVjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo\nMQ8wDQYDVQQKEwZMZW5vdm8xFzAVBgNVBAMTDkxlbm92byBVRUZJIFBLMB4XDTE3\nMDUyNzAzNTMzN1oXDTQxMDUyNzAzNTMzN1owVjELMAkGA1UEBhMCVVMxCzAJBgNV\nBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdoMQ8wDQYDVQQKEwZMZW5vdm8xFzAVBgNV\nBAMTDkxlbm92byBVRUZJIFBLMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\nAQEA62pJedCNMZbqqqOfvpQb091Ov1SUZaAhIZl1GsaeZ9P0xHH1H93UdQSTA918\nqSHIxp31WLHdI+LiYEnJbXZgnJ2RhEPVXE55VvzUTI6zEV5elo5adnxXmXH7oz6x\n35nIBYCKGayfM+jg/S1oJr5s5H9/67M88nijZS/8dDg29UTVcu+YM4IgbNhY48Gi\nrPG+iIQ4kh4PcdPY+SAEHIxD94HhlTQHnrLrWjF9hdepVty48KrqcQYfKmsUAJ6M\nzyxYIyIEJSG61Lv49DlbPppC7uVjVV+laPwJyzoqg5c1lkhz0HaODy0OI7i8gTiH\nAe2vGt6liKQbsDvXS/Xy8kmn8wIDAQABozMwMTAPBgNVHRMBAf8EBTADAQH/MA4G\nA1UdDwEB/wQEAwICBDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB\nAAl2n3X/rZSKQju2AbBcmuRnPUXwqih5Qql+oOYzsE3XaZC1vILAAJLBUcHvbGkL\n40JQ9NaUAzxsaeERoMl7vneyNTutY03tmIDdC0nYzN9eEZO0GSEAVKoxgxLZ+od3\na2yGZ9htjCvaqUNniOlXCKQ0T595Z24mwY20F/ras1j8WXAYjyiCBUDpWi70VAdB\n0aCpZzterITmo7ymx7zK2hHIaYbRlXIXLMesdfSS/4hSLR49SvfVbOcnajdfmcI/\nXIWNRE/Xvg17lrgjMZ0vdU4wCVe2sAh6ckB45tJM/v97ICCZZld0Ee8IH1ayabmo\njSgtuHs9sxviahyMDv3gEGk=\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "PK.contoso.org"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "Contoso UEFI PK"
+    },
+    "ValidNotBefore": "2018-09-07T13:22:05Z",
+    "ValidNotAfter": "2041-09-07T13:22:05Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature"
+    ],
+    "UefiSignatureOwner": "5491316d-9694-4639-b72d-b8630ffa7dab",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/index.json
new file mode 100644
index 0000000..03bd6b5
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/index.json
@@ -0,0 +1,16 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/1"
+        }
+    ],
+    "@Redfish.SupportedCertificates": [
+        "PEM"
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/index.json
new file mode 100644
index 0000000..d9148f8
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#SecureBootDatabase.v1_0_1.SecureBootDatabase",
+    "Id": "PKDefault",
+    "Name": "PKDefault - Default Platform Key",
+    "Description": "UEFI PKDefault Secure Boot Database",
+    "DatabaseId": "PKDefault",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault/Certificates/"
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/1/index.json
new file mode 100644
index 0000000..654be27
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/1/index.json
@@ -0,0 +1,33 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "1",
+    "Name": "Contoso db Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDbTCCAlWgAwIBAgIUO2MdJt2cTCGr0eO4PiBV5Uk0b/IwDQYJKoZIhvcNAQEL\nBQAwVjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo\nMQ8wDQYDVQQKEwZMZW5vdm8xFzAVBgNVBAMTDkxlbm92byBVRUZJIERCMB4XDTE3\nMDMxNTIxMTYzNFoXDTQxMDMxNTIxMTYzNFowVjELMAkGA1UEBhMCVVMxCzAJBgNV\nBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdoMQ8wDQYDVQQKEwZMZW5vdm8xFzAVBgNV\nBAMTDkxlbm92byBVRUZJIERCMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\nAQEA1ezmdoBlk5yDVuXw8F774CvllhMz9bT0/TpH3kmRpPAizSRDzbHLUuBMC6SE\nW4zjdLxTqOlwZt6UUcWxlyzKcoDPe43cE6YH1kM/rscvm3AaVL+4GcyGgS9DL6qe\nQFHWER25xCTokMsCdKB42Ty7hWW5FBPepgAS+GDfqQfb/4hoonIlen5X+dqVIsE/\nRM1DIVBUiIbJdgERYeoGjY/Rh4A1VWl6ErzyzokYnf63JjSFR2kVV0apbr4ISOTM\n7qBd1RNHwQrCAryRADX1XGvRZURzwQdEXfOqZOkVjNKr1fD761qvPE8TQWWJ9Q8r\nmciMocIXqoqWKPAkgbMwKmcsFQIDAQABozMwMTAPBgNVHRMBAf8EBTADAQH/MA4G\nA1UdDwEB/wQEAwICBDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB\nAJ2U0UjB+sxF/HE5sY56vJbdFITl8o0Yf7XJImL0VTgpYjfeqiE768G2uTUbzCKy\nhDOps3+4w4p8FUSO6StzCz6UuUyxlUjQzpkxZ97Ouq1sGhjy7dZybTEByJD6LpI7\nl1EpJSfBiwxTdm7svJoABKs8Hs7e9f3XX5PK76SxllMbDaxAm7UvCppYBBR1SeyC\ngWt3rGRiO3W6pfd07ioCD03kgGzYNOZeU2S+maE1Xt4kUoYs3HXyrhJGfN26gM8h\n4w5LfCKrlxi+3KMf+vXxEBfGYBvjwcA7KCW92GnUQGVjZbEGs6EaTBx7i9gA2+te\noWS/500qiwNRp2xqdBxg1d0=\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "db.contoso.org"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "Contoso UEFI db"
+    },
+    "ValidNotBefore": "2018-09-07T13:22:05Z",
+    "ValidNotAfter": "2041-09-07T13:22:05Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature"
+    ],
+    "UefiSignatureOwner": "5491316d-9694-4639-b72d-b8630ffa7dab",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/2/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/2/index.json
new file mode 100644
index 0000000..9ad4b5b
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/2/index.json
@@ -0,0 +1,32 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "2",
+    "Name": "Microsoft Corporation UEFI CA Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIDbzCCAlegAwIBAgIUf2b1tKa8CXy2shrPf6i1mIwnRTcwDQYJKoZIhvcNAQEL\nBQAwVzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5DMRAwDgYDVQQHEwdSYWxlaWdo\nMQ8wDQYDVQQKEwZMZW5vdm8xGDAWBgNVBAMTD0xlbm92byBVRUZJIEtFSzAeFw0x\nNzA1MjcwMzU0NDJaFw00MTA1MjcwMzU0NDJaMFcxCzAJBgNVBAYTAlVTMQswCQYD\nVQQIEwJOQzEQMA4GA1UEBxMHUmFsZWlnaDEPMA0GA1UEChMGTGVub3ZvMRgwFgYD\nVQQDEw9MZW5vdm8gVUVGSSBLRUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK\nAoIBAQDCu6lcSg/MmtcXRGPmxSaMRuFUa/Hoge40OnklJ936OYqPTTZGPZMld0mq\nzrfW/jZ7YYbtbS2vLTU4uzKo6YHRgp+IlAalmXZNh+D1MsJpJ1zqbxkcBW/ohPZY\nTgNPugYeVw+kbcunxQPqa6dvgidGu6qo3uLCJ0kWmZeCqGLgJ8NkKyGpiALALCcK\njVHNd87WUVnf9V1VsqRGytIOk42VbxBjuP1yS/nW1yJ+9wmftYtDy6/MuFT7DIM7\n1cVsRZGlM0WZbfVxHVAd8KGOvsXMOu7vgfKrLd/ZOWwtk+Iqthg23+Cc7aY2tc9q\nS1pa378idhbY8beJIyjCQgdheL8vAgMBAAGjMzAxMA8GA1UdEwEB/wQFMAMBAf8w\nDgYDVR0PAQH/BAQDAgIEMA4GA1UdDwEB/wQEAwIHgDANBgkqhkiG9w0BAQsFAAOC\nAQEAtcTQVLt/t8ijoB6Na4pvdtG0c11ZG9vJvx0mZEgp30VUwgWPqnlAmkA5RNhh\nate/fGNvwAuyJZjiHJ4nqtJ9/pEDc+RMnPiGZDzKZcZlYiqOwod6nZklGw6X3f45\nxmiM+YYfeY1vlptTnm2FyuFtgqiJ6lAVJ4c17KyrsDBw79G/3hsB9H3E8YeyA0kq\nXELejPl9JSSCvY6+KtO/BFRR36Q1Xwz9lUWI+tLkAiOLIgLsJBu4ADX276pCGGTw\nIj9pRcFEjGwp3iwXid4323b36iLiUDyQTkBGjzZlIZekSS+BMEyZ9RKoIyrxyUjC\npmPlF6edID9hg2iv9pPjGfFfKQ==\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Washington",
+        "City": "Redmond",
+        "Organization": "Microsoft Corporation",
+        "CommonName": "Microsoft Corporation Third Party Marketplace Root"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Washington",
+        "City": "Redmond",
+        "Organization": "Microsoft Corporation",
+        "CommonName": "Microsoft Corporation UEFI CA 2011"
+    },
+    "ValidNotBefore": "2011-06-27T14:22:45Z",
+    "ValidNotAfter": "2026-06-27T14:32:45Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature",
+        "CRLSigning"
+    ],
+    "UefiSignatureOwner": "77fa9abd-0359-4d32-bd60-28f4e78f784b",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/3/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/3/index.json
new file mode 100644
index 0000000..e7a0ab9
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/3/index.json
@@ -0,0 +1,32 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "3",
+    "Name": "Microsoft Corporation Windows Production Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIF1zCCA7+gAwIBAgIKYQd2VgAAAAAACDANBgkqhkiG9w0BAQsFADCBiDELMAkG\nA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQx\nHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9z\nb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMTExMDE5MTg0\nMTQyWhcNMjYxMDE5MTg1MTQyWjCBhDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldh\nc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBD\nb3Jwb3JhdGlvbjEuMCwGA1UEAxMlTWljcm9zb2Z0IFdpbmRvd3MgUHJvZHVjdGlv\nbiBQQ0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0Mu6Lk\nLgnj58X3lmm8ACG9aTMz760Ey1SA7gaDu8UghNn30ovzOLCrpK0tfGJ5Bf/jSj8E\nNSBw48Tna+CcwDZ16Yox3Y1w5dw3tXRGlihbh2AjLL/cR6Vn91EnnnLrB6bJuR47\nUzV85dPsJ7mHHP65ySMJb6hGkcFuljxB08ujP10Cak3saR8lKFw2//1DFQqU4Bm0\nz9/CEuLCWyfuJ3gwi1sqCWsiiVNgFizAaB1TuuxJ851hjIVoCXNEXX2iVCvdefcV\nzzVdbBwrXM68nCOLb261Jtk2E8NP1ieuuTI7QZIs4cfNd+iqVE73XAsEh2W0Qxio\nsuBtGXfsWiT6SAMCAwEAAaOCAUMwggE/MBAGCSsGAQQBgjcVAQQDAgEAMB0GA1Ud\nDgQWBBSpKQI5jhbEl3jNkPmeT5rhfFWvUzAZBgkrBgEEAYI3FAIEDB4KAFMAdQBi\nAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV\n9lbLj+iiXGJo0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3Js\nLm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAx\nMC0wNi0yMy5jcmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8v\nd3d3Lm1pY3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2\nLTIzLmNydDANBgkqhkiG9w0BAQsFAAOCAgEAFPx8cVGlecJusu85Prw8Ug9uKz8Q\nE3P+qGjQSKY0TYqWBSbuMUaQYXnW/zguRWv0wOUouNodj4rbCdcax0wKNmZqjOwb\n1wSQqBgXpJu54kAyNnbEwVrGv+QEwOoW06zDaO9irN1UbFAwWKbrfP6Up06O9Ox8\nhnNXwlIhczRa86OKVsgE2gcJ7fiL4870fo6u8PYLigj7P8kdcn9TuOu+Y+DjPTFl\nsIHl8qzNFqSfPaixm8JC0JCEX1Qd/4nquh1HkG+wc05Bn0CfX+WhKrIRkXOKISjw\nzt5zOV8+q1xg7N8DEKjTCen09paFtn9RiGZHGY2isBI9gSpoBXe7kUxie7bBB8e6\neoc0Aw5LYnqZ6cr8zko3yS2kV3wc/j3cuA9a+tbEswKFAjrqs9lu5GkhN96B0fZ1\nGQVn05NXXikbOcjuLeHN5EVzW9DSznqrFhmCRljQXp2Bs2evbDXyvOU/JOI1ogp1\nBvYYVpnUeCzRBRvr0IgBnaoQ8QXfun4sY7cGmyMhxPl4bOJYFwY2K5ESA8yk2fIt\nuvmUnUDtGEXxzopcaz6rA9NwGCoKauBfR9HVYwoy8q/XNh8qcFrlQlkIcUtXun6D\ngfAhPPQcwcW5kJMOiEWThumxIJm+mMvFlaRdYtagYwggvXUQd30980W5n5efy1eA\nbzOpBM93pGIcWX4=\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Washington",
+        "City": "Redmond",
+        "Organization": "Microsoft Corporation",
+        "CommonName": "Microsoft Root Certificate Authority 2010"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Washington",
+        "City": "Redmond",
+        "Organization": "Microsoft Corporation",
+        "CommonName": "Microsoft Windows Production PCA 2011"
+    },
+    "ValidNotBefore": "2011-10-19T11:41:42Z",
+    "ValidNotAfter": "2026-10-19T11:51:42Z",
+    "KeyUsage": [
+        "KeyCertSign",
+        "DigitalSignature",
+        "CRLSigning"
+    ],
+    "UefiSignatureOwner": "77fa9abd-0359-4d32-bd60-28f4e78f784b",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/3",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/index.json
new file mode 100644
index 0000000..74488e2
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/index.json
@@ -0,0 +1,22 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 3,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/2"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/3"
+        }
+    ],
+    "@Redfish.SupportedCertificates": [
+        "PEM"
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/1/index.json
new file mode 100644
index 0000000..909bddb
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/1/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#Signature.v1_0_2.Signature",
+    "Id": "1",
+    "Name": "SHA256 Signature",
+    "SignatureString": "80B4D96931BF0D02FD91A61E19D14F1DA452E66DB2408CA8604D411F92659F0A",
+    "SignatureTypeRegistry": "UEFI",
+    "SignatureType": "EFI_CERT_SHA256_GUID",
+    "UefiSignatureOwner": "28d5e212-165b-4ca0-909b-c86b9cee0112",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/index.json
new file mode 100644
index 0000000..5661b5a
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#SignatureCollection.SignatureCollection",
+    "Name": "Signature Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/1"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/index.json
new file mode 100644
index 0000000..6091755
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/index.json
@@ -0,0 +1,26 @@
+{
+    "@odata.type": "#SecureBootDatabase.v1_0_1.SecureBootDatabase",
+    "Id": "db",
+    "Name": "db - Authorized Signature Database",
+    "Description": "UEFI db Secure Boot Database",
+    "DatabaseId": "db",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Certificates/"
+    },
+    "Signatures": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/"
+    },
+    "Actions": {
+        "#SecureBootDatabase.ResetKeys": {
+            "target": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Actions/SecureBootDatabase.ResetKeys",
+            "ResetKeysType@Redfish.AllowableValues": [
+                "ResetAllKeysToDefault",
+                "DeleteAllKeys"
+            ]
+        },
+        "Oem": {}
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures/1/index.json
new file mode 100644
index 0000000..6cb94d1
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures/1/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#Signature.v1_0_2.Signature",
+    "Id": "1",
+    "Name": "SHA256 Signature",
+    "SignatureString": "80B4D96931BF0D02FD91A61E19D14F1DA452E66DB2408CA8604D411F92659F0A",
+    "SignatureTypeRegistry": "UEFI",
+    "SignatureType": "EFI_CERT_SHA256_GUID",
+    "UefiSignatureOwner": "28d5e212-165b-4ca0-909b-c86b9cee0112",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures/index.json
new file mode 100644
index 0000000..2edbb4e
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures/index.json
@@ -0,0 +1,9 @@
+{
+    "@odata.type": "#SignatureCollection.SignatureCollection",
+    "Name": "Signature Collection",
+    "Members@odata.count": 0,
+    "Members": [],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/index.json
new file mode 100644
index 0000000..d128703
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#SecureBootDatabase.v1_0_1.SecureBootDatabase",
+    "Id": "dbDefault",
+    "Name": "dbDefault - Default Authorized Signature Database",
+    "Description": "UEFI dbDefault Secure Boot Database",
+    "DatabaseId": "dbDefault",
+    "Signatures": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault/Signatures/"
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Certificates/index.json
new file mode 100644
index 0000000..52af80a
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Certificates/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 0,
+    "Members": [],
+    "@Redfish.SupportedCertificates": [
+        "PEM"
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/1/index.json
new file mode 100644
index 0000000..f309519
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/1/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#Signature.v1_0_2.Signature",
+    "Id": "1",
+    "Name": "SHA256 Signature",
+    "SignatureString": "0000000000000000000000000000000000000000000000000000000000000000",
+    "SignatureTypeRegistry": "UEFI",
+    "SignatureType": "EFI_CERT_SHA256_GUID",
+    "UefiSignatureOwner": "00000000-0000-0000-0000-000000000000",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/2/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/2/index.json
new file mode 100644
index 0000000..f2f102d
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/2/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#Signature.v1_0_2.Signature",
+    "Id": "2",
+    "Name": "SHA256 Signature",
+    "SignatureString": "AF460B2C71D4BA303980B38CD9A09A9FC092D9B0DDBC9ADF824BF6C72CD980AB",
+    "SignatureTypeRegistry": "UEFI",
+    "SignatureType": "EFI_CERT_SHA256_GUID",
+    "UefiSignatureOwner": "b30f32b3-eca0-41a6-3777-a22bcf62cab2",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/3/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/3/index.json
new file mode 100644
index 0000000..6e1b907
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/3/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#Signature.v1_0_2.Signature",
+    "Id": "3",
+    "Name": "SHA256 Signature",
+    "SignatureString": "ACD161952F7B443BF2E83F9AFC7E0F972CB4448DA3814A7F8047584F2102E7B7",
+    "SignatureTypeRegistry": "UEFI",
+    "SignatureType": "EFI_CERT_SHA256_GUID",
+    "UefiSignatureOwner": "b30f32b3-eca0-41a6-3777-a22bcf62cab2",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/3",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/index.json
new file mode 100644
index 0000000..563c464
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/index.json
@@ -0,0 +1,19 @@
+{
+    "@odata.type": "#SignatureCollection.SignatureCollection",
+    "Name": "Signature Collection",
+    "Members@odata.count": 3,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/2"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/3"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/index.json
new file mode 100644
index 0000000..fc6dbb5
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/index.json
@@ -0,0 +1,26 @@
+{
+    "@odata.type": "#SecureBootDatabase.v1_0_1.SecureBootDatabase",
+    "Id": "dbx",
+    "Name": "dbx - Forbidden Signature Database",
+    "Description": "UEFI dbx Secure Boot Database",
+    "DatabaseId": "dbx",
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Certificates/"
+    },
+    "Signatures": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Signatures/"
+    },
+    "Actions": {
+        "#SecureBootDatabase.ResetKeys": {
+            "target": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx/Actions/SecureBootDatabase.ResetKeys",
+            "ResetKeysType@Redfish.AllowableValues": [
+                "ResetAllKeysToDefault",
+                "DeleteAllKeys"
+            ]
+        },
+        "Oem": {}
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures/1/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures/1/index.json
new file mode 100644
index 0000000..1e2b6a6
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures/1/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#Signature.v1_0_2.Signature",
+    "Id": "1",
+    "Name": "SHA256 Signature",
+    "SignatureString": "0000000000000000000000000000000000000000000000000000000000000000",
+    "SignatureTypeRegistry": "UEFI",
+    "SignatureType": "EFI_CERT_SHA256_GUID",
+    "UefiSignatureOwner": "00000000-0000-0000-0000-000000000000",
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures/index.json
new file mode 100644
index 0000000..06fded2
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#SignatureCollection.SignatureCollection",
+    "Name": "Signature Collection",
+    "Members@odata.count": 3,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db/Signatures/1"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/index.json
new file mode 100644
index 0000000..a146f03
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/index.json
@@ -0,0 +1,13 @@
+{
+    "@odata.type": "#SecureBootDatabase.v1_0_1.SecureBootDatabase",
+    "Id": "dbxDefault",
+    "Name": "dbxDefault - Default Forbidden Signature Database",
+    "Description": "UEFI dbxDefault Secure Boot Database",
+    "DatabaseId": "dbxDefault",
+    "Signatures": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault/Signatures/"
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/index.json
new file mode 100644
index 0000000..7bdbcc1
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#SecureBootDatabaseCollection.SecureBootDatabaseCollection",
+    "Name": "UEFI SecureBoot Database Collection",
+    "Members@odata.count": 8,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PK"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEK"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/db"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbx"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/PKDefault"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/KEKDefault"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbDefault"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases/dbxDefault"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SecureBoot/index.json b/public-rackmount1/Systems/437XR1138R2/SecureBoot/index.json
new file mode 100644
index 0000000..44ba641
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/SecureBoot/index.json
@@ -0,0 +1,25 @@
+{
+    "@odata.type": "#SecureBoot.v1_1_0.SecureBoot",
+    "Id": "SecureBoot",
+    "Name": "UEFI Secure Boot",
+    "Actions": {
+        "#SecureBoot.ResetKeys": {
+            "target": "/redfish/v1/Systems/437XR1138R2/SecureBoot/Actions/SecureBoot.ResetKeys",
+            "ResetKeysType@Redfish.AllowableValues": [
+                "ResetAllKeysToDefault",
+                "DeleteAllKeys",
+                "DeletePK"
+            ]
+        },
+        "Oem": {}
+    },
+    "SecureBootEnable": false,
+    "SecureBootCurrentBoot": "Disabled",
+    "SecureBootMode": "UserMode",
+    "SecureBootDatabases": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot/SecureBootDatabases"
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SimpleStorage/1/index.json b/public-rackmount1/Systems/437XR1138R2/SimpleStorage/1/index.json
index 3d30c5a..5fe94dd 100644
--- a/public-rackmount1/Systems/437XR1138R2/SimpleStorage/1/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/SimpleStorage/1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#SimpleStorage.v1_2_3.SimpleStorage",
+    "@odata.type": "#SimpleStorage.v1_3_1.SimpleStorage",
     "Id": "1",
     "Name": "Simple Storage Controller",
     "Description": "System SATA",
@@ -44,5 +44,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/SimpleStorage/1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/SimpleStorage/index.json b/public-rackmount1/Systems/437XR1138R2/SimpleStorage/index.json
index 2673664..7731ef2 100644
--- a/public-rackmount1/Systems/437XR1138R2/SimpleStorage/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/SimpleStorage/index.json
@@ -8,5 +8,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Systems/437XR1138R2/SimpleStorage",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/1/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/1/index.json
new file mode 100644
index 0000000..fdcd35c
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/1/index.json
@@ -0,0 +1,41 @@
+{
+    "@odata.type": "#Port.v1_8_0.Port",
+    "Id": "1",
+    "Name": "USB Port 1",
+    "Description": "USB Port 1",
+    "Enabled": true,
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PortId": "1",
+    "PortProtocol": "USB",
+    "PortType": "BidirectionalPort",
+    "CurrentSpeedGbps": 0.12,
+    "Width": 1,
+    "MaxSpeedGbps": 10,
+    "CurrentProtocolVersion": "2.0",
+    "CapableProtocolVersions": [
+        "1.0",
+        "1.1",
+        "2.0",
+        "3.0",
+        "3.1"
+    ],
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "USB 1",
+            "LocationOrdinalValue": 1,
+            "LocationType": "Connector",
+            "Orientation": "TopToBottom",
+            "Reference": "Front"
+        }
+    },
+    "Actions": {
+        "Oem": {}
+    },
+    "Links": {},
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1/Ports/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/2/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/2/index.json
new file mode 100644
index 0000000..ebf5e23
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/2/index.json
@@ -0,0 +1,41 @@
+{
+    "@odata.type": "#Port.v1_8_0.Port",
+    "Id": "2",
+    "Name": "USB Port 2",
+    "Description": "USB Port 2",
+    "Enabled": true,
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PortId": "2",
+    "PortProtocol": "USB",
+    "PortType": "BidirectionalPort",
+    "CurrentSpeedGbps": 0,
+    "Width": 1,
+    "MaxSpeedGbps": 10,
+    "CurrentProtocolVersion": null,
+    "CapableProtocolVersions": [
+        "1.0",
+        "1.1",
+        "2.0",
+        "3.0",
+        "3.1"
+    ],
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "USB 2",
+            "LocationOrdinalValue": 2,
+            "LocationType": "Connector",
+            "Orientation": "TopToBottom",
+            "Reference": "Front"
+        }
+    },
+    "Actions": {
+        "Oem": {}
+    },
+    "Links": {},
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1/Ports/2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/index.json
new file mode 100644
index 0000000..8815ff1
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/Ports/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#PortCollection.PortCollection",
+    "Name": "Port Collection",
+    "Description": "USB Port Collection",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1/Ports/1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1/Ports/2"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1/Ports",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/index.json
new file mode 100644
index 0000000..cb9aa75
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB1/index.json
@@ -0,0 +1,32 @@
+{
+    "@odata.type": "#USBController.v1_0_0.USBController",
+    "Id": "USB1",
+    "Name": "Contoso USB Controller 1",
+    "Manufacturer": "Contoso",
+    "Model": "USBv3",
+    "SKU": "80937",
+    "SerialNumber": "2M220100SL",
+    "PartNumber": "G37891",
+    "SparePartNumber": "G37890",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Ports": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1/Ports"
+    },
+    "Links": {
+        "Processors": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1"
+            },
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU2"
+            }
+        ],
+        "PCIeDevice": {}
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/1/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/1/index.json
new file mode 100644
index 0000000..e7f5352
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/1/index.json
@@ -0,0 +1,38 @@
+{
+    "@odata.type": "#Port.v1_8_0.Port",
+    "Id": "1",
+    "Name": "USB Port 3",
+    "Description": "USB Port 3",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PortId": "3",
+    "PortProtocol": "USB",
+    "PortType": "BidirectionalPort",
+    "CurrentSpeedGbps": 0.12,
+    "Width": 1,
+    "MaxSpeedGbps": 0.48,
+    "CurrentProtocolVersion": "2.0",
+    "CapableProtocolVersions": [
+        "1.0",
+        "1.1",
+        "2.0"
+    ],
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "USB 3",
+            "LocationOrdinalValue": 3,
+            "LocationType": "Connector",
+            "Orientation": "TopToBottom",
+            "Reference": "Front"
+        }
+    },
+    "Actions": {
+        "Oem": {}
+    },
+    "Links": {},
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB2/Ports/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/2/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/2/index.json
new file mode 100644
index 0000000..66c412c
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/2/index.json
@@ -0,0 +1,38 @@
+{
+    "@odata.type": "#Port.v1_8_0.Port",
+    "Id": "2",
+    "Name": "USB Port 4",
+    "Description": "USB Port 4",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "PortId": "4",
+    "PortProtocol": "USB",
+    "PortType": "BidirectionalPort",
+    "CurrentSpeedGbps": 0,
+    "Width": 1,
+    "MaxSpeedGbps": 0.48,
+    "CurrentProtocolVersion": null,
+    "CapableProtocolVersions": [
+        "1.0",
+        "1.1",
+        "2.0"
+    ],
+    "Location": {
+        "PartLocation": {
+            "ServiceLabel": "USB 4",
+            "LocationOrdinalValue": 4,
+            "LocationType": "Connector",
+            "Orientation": "TopToBottom",
+            "Reference": "Front"
+        }
+    },
+    "Actions": {
+        "Oem": {}
+    },
+    "Links": {},
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB2/Ports/2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/index.json
new file mode 100644
index 0000000..6244b8f
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/Ports/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#PortCollection.PortCollection",
+    "Name": "Port Collection",
+    "Description": "USB Port Collection",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB2/Ports/1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB2/Ports/2"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB2/Ports",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/index.json
new file mode 100644
index 0000000..46ba6e4
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/USB2/index.json
@@ -0,0 +1,31 @@
+{
+    "@odata.type": "#USBController.v1_0_0.USBController",
+    "Id": "USB2",
+    "Name": "Contoso USB Controller 2",
+    "Manufacturer": "Contoso",
+    "Model": "USBv2",
+    "SKU": "80937",
+    "SerialNumber": "2M220100SL",
+    "PartNumber": "G37891",
+    "SparePartNumber": "G37890",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Ports": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB2/Ports"
+    },
+    "Links": {
+        "Processors": [
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU1"
+            },
+            {
+                "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors/CPU2"
+            }
+        ]
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB2",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/USBControllers/index.json b/public-rackmount1/Systems/437XR1138R2/USBControllers/index.json
new file mode 100644
index 0000000..ad04cc2
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/USBControllers/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#USBControllerCollection.USBControllerCollection",
+    "Name": "USBControllers",
+    "Description": "Redfish USB Controllers",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers/USB2"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/1/index.json b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/1/index.json
new file mode 100644
index 0000000..688c4f3
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/1/index.json
@@ -0,0 +1,35 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "1",
+    "Name": "HTTPS Certificate",
+    "CertificateString": "------BEGIN CERTIFICATE-----\nMIIFvzCCA6egAwIBAgIJAIkDi2/oWYwhMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV\nBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYD\nVQQKDAdDb250b3NvMRYwFAYDVQQLDA1JbWFnZSBIb3N0aW5nMRkwFwYDVQQDDBBy\nZWRmaXNoLmRtdGYub3JnMB4XDTIxMDkyMjIwNTAwOFoXDTIyMDkyMjIwNTAwOFow\ndjELMAkGA1UEBhMCVVMxDzANBgNVBAgMBk9yZWdvbjERMA8GA1UEBwwIUG9ydGxh\nbmQxEDAOBgNVBAoMB0NvbnRvc28xFjAUBgNVBAsMDUltYWdlIEhvc3RpbmcxGTAX\nBgNVBAMMEHJlZGZpc2guZG10Zi5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw\nggIKAoICAQCwxEYgPsHZSjY9FRcJRIB/EkUqHSOXoMlSSM250Ju6Fd3TY3yl3G1a\nccUskvQS1iYQbasPvyi8hOJE4rKIz/4CKPvZjMun+flHGktIb33wjIuxenzj8UoK\nuPYsEQc5HNB9NUwqrPT1PHob75CdYOZSJoqQqSX4LZpiYNKHRgI/njaLzzn8HRBI\nxk/pUj23i11uZtriQKBUY8lQuDiDr7MyuFOOk3x6+vdgzWSkJD6NA/tUAchy5SwQ\n8P368KT7ZM9KCirzWgNCKG51aNzrc8qY/Y7180/Emca2JQR3jPuI/HTp9C8cril/\nb1bFIWgVHJivehjLjBhA+HS8hk0j76RyqfKr/emRshW/2ch3LOsa2G8Bv8qD2BBX\naJ/zfS+WuN1T/ekOOEdP9G1HNxVGdr+WV4zDyFQxDJnKCLIQxc4RMX9iNIIa1w9z\n8ZMCtzb4Fwtkan0Pf/VP7zjBo1V3WgVs/2LSy0+cKMUTUUJTDUo4NQFt+cbArDqR\nGYoChCc/0foaaZUOmZ7pMWg4MeVr3eh9ZrSofhEFiS+SWNzdlUf2XXKa+xXOmUw4\n+yB3+zW4FBduKqBVL04XS4ruVxl0dYP7h2n9Qjp6N7eYBGsfPIFFKvHCTNeZuFrX\nEJNheFrJwBTre9Any7FtRESS+MzqmDSX4ErBuR6iwQtVTp59LN8gzwIDAQABo1Aw\nTjAdBgNVHQ4EFgQUzSniTsBoaxfcA+IL+bVV+9GS9OYwHwYDVR0jBBgwFoAUzSni\nTsBoaxfcA+IL+bVV+9GS9OYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC\nAgEAaX0gqlyvn7iFfD9YR+frnBwcKDC85gQULTc1JlV3ybWl63fEb/SD7EGYp8kU\n/4LkO3Ig/qqSMIkMp+IHvjkhCFW6BP3j4NwBRmXWwDK/AjVODGpucu6HjhJ4cT1c\n2dxNz+TYgghuArdnBxKObcrgOmSzB0j3fcFqXJB5YJNWMd/K0MpdCGwwH4J2GM+2\nxH4Sf/48txQ0bkVqBzT1QstWCF4ZEoStSfTviw6XnqOvXlGoBEn2Yw7RnGUitHwd\nK+g77V/ReFkJ/SJimYUCt1h04Bt7BsFLICOPmZ+YsDtr5D6NxOvh+ixtQ//MfXTl\n6REiSugnJ7hxymfmF8GIiXxJ05aXTFZfSah3P+77L6Vtfabjnzdq7elHP3lPKSBz\nQZr5AK/TiPO+RbMGK54vhiaEHgTVJ8YNNxrTugknwx6jd2jPmjXJreBfj1WfsX8i\npbIcipdfJfeH7QsTkaiTq78Cxx/nHARKpF0dh/YwgYvLbDYHz1h3nxrH95VemOAK\nrWe1MGZx8bO0w87qKsMAexo313MhssUgRr8gzUQfkGTlYCbAwXu1JOWxHaXtDBRE\n/u7mvf2qSQiYokPhBAm26VHPv8gyb6XowcPI6ZSxKTEidgwDkyWUzlvCa3k9hdLm\nKFN7+DYh2oeVCrbxsXM1U/35/Is7+Pu8TOvJY5uQsO3+w9M=\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "Image Hosting",
+        "CommonName": "redfish.dmtf.org"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "Image Hosting",
+        "CommonName": "redfish.dmtf.org"
+    },
+    "ValidNotBefore": "2021-09-22T20:50:08Z",
+    "ValidNotAfter": "2022-09-22T20:50:08Z",
+    "KeyUsage": [
+        "KeyEncipherment",
+        "ServerAuthentication"
+    ],
+    "SerialNumber": "89:03:8B:6F:E8:59:8C:21",
+    "Fingerprint": "5C:58:1E:1E:11:17:A1:03:68:3C:12:8A:D4:F2:DD:10:45:15:93:61",
+    "FingerprintHashAlgorithm": "TPM_ALG_SHA1",
+    "SignatureAlgorithm": "sha256WithRSAEncryption",
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/index.json
new file mode 100644
index 0000000..cfd064e
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/index.json
@@ -0,0 +1,15 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/1"
+        }
+    ],
+    "@Redfish.SupportedCertificates": [
+        "PEM"
+    ],
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/VirtualMedia/CD1/index.json b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/index.json
similarity index 51%
rename from public-rackmount1/Managers/BMC/VirtualMedia/CD1/index.json
rename to public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/index.json
index 05e5f6e..a58c29e 100644
--- a/public-rackmount1/Managers/BMC/VirtualMedia/CD1/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/CD1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#VirtualMedia.v1_3_2.VirtualMedia",
+    "@odata.type": "#VirtualMedia.v1_6_0.VirtualMedia",
     "Id": "CD1",
     "Name": "Virtual CD",
     "MediaTypes": [
@@ -11,6 +11,10 @@
     "ConnectedVia": "Applet",
     "Inserted": true,
     "WriteProtected": false,
-    "@odata.id": "/redfish/v1/Managers/BMC/VirtualMedia/CD1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "VerifyCertificate": true,
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates"
+    },
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/CD1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/VirtualMedia/Floppy1/Certificates/index.json b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/Floppy1/Certificates/index.json
new file mode 100644
index 0000000..d8c7373
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/Floppy1/Certificates/index.json
@@ -0,0 +1,11 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 0,
+    "Members": [],
+    "@Redfish.SupportedCertificates": [
+        "PEM"
+    ],
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/Floppy1/Certificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Managers/BMC/VirtualMedia/Floppy1/index.json b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/Floppy1/index.json
similarity index 52%
rename from public-rackmount1/Managers/BMC/VirtualMedia/Floppy1/index.json
rename to public-rackmount1/Systems/437XR1138R2/VirtualMedia/Floppy1/index.json
index 806fe42..e4c6b7f 100644
--- a/public-rackmount1/Managers/BMC/VirtualMedia/Floppy1/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/Floppy1/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#VirtualMedia.v1_3_2.VirtualMedia",
+    "@odata.type": "#VirtualMedia.v1_6_0.VirtualMedia",
     "Id": "Floppy1",
     "Name": "Virtual Removable Media",
     "MediaTypes": [
@@ -11,6 +11,10 @@
     "ConnectedVia": "URI",
     "Inserted": true,
     "WriteProtected": false,
-    "@odata.id": "/redfish/v1/Managers/BMC/VirtualMedia/Floppy1",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "VerifyCertificate": false,
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/Floppy1/Certificates"
+    },
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/Floppy1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/VirtualMedia/index.json b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/index.json
new file mode 100644
index 0000000..7a05f83
--- /dev/null
+++ b/public-rackmount1/Systems/437XR1138R2/VirtualMedia/index.json
@@ -0,0 +1,17 @@
+{
+    "@odata.type": "#VirtualMediaCollection.VirtualMediaCollection",
+    "Name": "Virtual Media Services",
+    "Description": "Virtual Media Service Settings",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/Floppy1"
+        },
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/CD1"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/437XR1138R2/index.json b/public-rackmount1/Systems/437XR1138R2/index.json
index 2d8dca7..753f7b2 100644
--- a/public-rackmount1/Systems/437XR1138R2/index.json
+++ b/public-rackmount1/Systems/437XR1138R2/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#ComputerSystem.v1_10_0.ComputerSystem",
+    "@odata.type": "#ComputerSystem.v1_20_0.ComputerSystem",
     "Id": "437XR1138R2",
     "Name": "WebFrontEnd483",
     "SystemType": "Physical",
@@ -64,10 +64,18 @@
             "Style": "Executive"
         }
     },
+    "BootProgress": {
+        "LastState": "OSRunning",
+        "LastStateTime": "2021-03-13T04:14:13+06:00",
+        "LastBootTimeSeconds": 676
+    },
+    "LastResetTime": "2021-03-13T04:02:57+06:00",
     "BiosVersion": "P79 v1.45 (12/06/2017)",
     "ProcessorSummary": {
         "Count": 2,
         "Model": "Multi-Core Intel(R) Xeon(R) processor 7xxx Series",
+        "LogicalProcessorCount": 16,
+        "CoreCount": 8,
         "Status": {
             "State": "Enabled",
             "Health": "OK",
@@ -87,6 +95,9 @@
     "Bios": {
         "@odata.id": "/redfish/v1/Systems/437XR1138R2/Bios"
     },
+    "SecureBoot": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/SecureBoot"
+    },
     "Processors": {
         "@odata.id": "/redfish/v1/Systems/437XR1138R2/Processors"
     },
@@ -102,6 +113,18 @@
     "LogServices": {
         "@odata.id": "/redfish/v1/Systems/437XR1138R2/LogServices"
     },
+    "GraphicsControllers": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/GraphicsControllers"
+    },
+    "USBControllers": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/USBControllers"
+    },
+    "Certificates": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/Certificates"
+    },
+    "VirtualMedia": {
+        "@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia"
+    },
     "Links": {
         "Chassis": [
             {
@@ -135,5 +158,5 @@
         }
     },
     "@odata.id": "/redfish/v1/Systems/437XR1138R2",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/Systems/index.json b/public-rackmount1/Systems/index.json
index 61c6001..245bf61 100644
--- a/public-rackmount1/Systems/index.json
+++ b/public-rackmount1/Systems/index.json
@@ -8,5 +8,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/Systems",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/TaskService/Tasks/545/index.json b/public-rackmount1/TaskService/Tasks/545/index.json
index 63a0a8e..7be655f 100644
--- a/public-rackmount1/TaskService/Tasks/545/index.json
+++ b/public-rackmount1/TaskService/Tasks/545/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#Task.v1_4_3.Task",
+    "@odata.type": "#Task.v1_7_0.Task",
     "Id": "545",
     "Name": "Task 545",
     "TaskState": "Completed",
@@ -20,5 +20,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/TaskService/Tasks/545",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/TaskService/Tasks/index.json b/public-rackmount1/TaskService/Tasks/index.json
index 3a39d51..0f3d703 100644
--- a/public-rackmount1/TaskService/Tasks/index.json
+++ b/public-rackmount1/TaskService/Tasks/index.json
@@ -8,5 +8,5 @@
         }
     ],
     "@odata.id": "/redfish/v1/TaskService/Tasks",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/TaskService/index.json b/public-rackmount1/TaskService/index.json
index 64bde10..5ff2961 100644
--- a/public-rackmount1/TaskService/index.json
+++ b/public-rackmount1/TaskService/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#TaskService.v1_1_4.TaskService",
+    "@odata.type": "#TaskService.v1_2_0.TaskService",
     "Id": "TaskService",
     "Name": "Tasks Service",
     "DateTime": "2015-03-13T04:14:33+06:00",
@@ -15,5 +15,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/TaskService",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/ClientCertificates/1/RekeyActionInfo/index.json b/public-rackmount1/UpdateService/ClientCertificates/1/RekeyActionInfo/index.json
new file mode 100644
index 0000000..078eea2
--- /dev/null
+++ b/public-rackmount1/UpdateService/ClientCertificates/1/RekeyActionInfo/index.json
@@ -0,0 +1,34 @@
+{
+    "@odata.type": "#ActionInfo.v1_3_0.ActionInfo",
+    "Id": "RekeyActionInfo",
+    "Name": "Rekey Action Info",
+    "Parameters": [
+        {
+            "Name": "KeyPairAlgorithm",
+            "Required": true,
+            "DataType": "String",
+            "AllowableValues": [
+                "TPM_ALG_RSA",
+                "TPM_ALG_ECDSA"
+            ]
+        },
+        {
+            "Name": "KeyBitLength",
+            "Required": false,
+            "DataType": "Number"
+        },
+        {
+            "Name": "KeyCurveId",
+            "Required": false,
+            "DataType": "String",
+            "AllowableValues": [
+                "TPM_ECC_NIST_P256",
+                "TPM_ECC_NIST_P384",
+                "TPM_ECC_NIST_P521"
+            ]
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/UpdateService/ClientCertificates/1/RekeyActionInfo",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/ClientCertificates/1/index.json b/public-rackmount1/UpdateService/ClientCertificates/1/index.json
new file mode 100644
index 0000000..0ffd2ee
--- /dev/null
+++ b/public-rackmount1/UpdateService/ClientCertificates/1/index.json
@@ -0,0 +1,45 @@
+{
+    "@odata.type": "#Certificate.v1_6_0.Certificate",
+    "Id": "1",
+    "Name": "Client Certificate",
+    "CertificateString": "-----BEGIN CERTIFICATE-----\nMIIFsTCCA5mgAwIBAgIJAMusGfV8beSJMA0GCSqGSIb3DQEBCwUAMG8xCzAJBgNV\nBAYTAlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYD\nVQQKDAdDb250b3NvMQwwCgYDVQQLDANBQkMxHDAaBgNVBAMME21hbmFnZXIuY29u\ndG9zby5vcmcwHhcNMTgwOTA3MTMyMjA1WhcNMTkwOTA3MTMyMjA1WjBvMQswCQYD\nVQQGEwJVUzEPMA0GA1UECAwGT3JlZ29uMREwDwYDVQQHDAhQb3J0bGFuZDEQMA4G\nA1UECgwHQ29udG9zbzEMMAoGA1UECwwDQUJDMRwwGgYDVQQDDBNtYW5hZ2VyLmNv\nbnRvc28ub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAw39VGz5K\n9bD8UUmyUxH+s+IaYsd3rd8V3R6g3bzttGOW52nopt3ZQD4COHPePBcCBh2+xRFk\n0Wd6oJUECXKNYhoFRJAhyz2fmkO5I37D40iY8/Ihqnt0Kmt/8hETL2VMKbALnR+4\nAUNNGSomRD24FQDlK1Vs6urZHvTsEL5Z+CNdbKY6Yn1ksxR8vmze4hdxnzrQCua1\no7zNVzudLdhVpfeC3BvmflMjszPOjlo5dSkXeRWqQ1LikgcHyEf3hYWq3WXMUpkV\nm2nlM3Tzeaz2nO1quQ/HJ/DUuvHHvWIIZdExL1RABzSN8Sr3ZkMShmTNN4QWmrEX\nEADN8g8OXrRKrup+R6nbUT55Getn5jPesI5fNDHk0KRBUG0ALY73l9+ZlAdRTesq\naV6AL2hUYrb1SNjh50i15s4yPOytspF4B9LaqsG1w3PGjgLaUtWHTXwGAMdHVhWs\nym//6zFv3Ri5tbjThpeYv+UIkreyb0yAFlx/Kz62EFbkFcnaGPATqVd4yLtVdYu0\nz5O8JWhOuybmWMe6ifO97X8w7/Nr9QyzkB64wXSqsNpRiuZraErqa+hBqvPkz8KE\nFEwiclRvZ9OrNk/iKr1FO1HNs1byvNyJ3S9Bu4bMwMnxzrdNzaB5Ti0IywIvQ/qw\nJ8icHIn+3EM5g+DmvQTZIXNKOryrndjIUA0CAwEAAaNQME4wHQYDVR0OBBYEFLLG\niNCud7LYUKojqRVNhKBWoApFMB8GA1UdIwQYMBaAFLLGiNCud7LYUKojqRVNhKBW\noApFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAG+NJSRv1S0K4KjE\nwzAIlEsmYs65vPxKLg0a07EW8xO4m7AKtty9dyc3+xh0ftwosTmXp2GL3RbNFqpc\nqDjS/XLDGS7DCb5T/g2vZusfUCz6WXpJCZMBLNyNaVyhTHeV9f8sCWXAODwx8ED2\nIHADWI9EqYg3HovYJNP4iUXfivBkFdq6ptOwgMVLGpeMvt/VwBilOklL/+xrhiMD\n1SwZ+sPdWfgcIaeQ+Y3h0cbHzCeYlZDXjDR41zGrEb1lhSAj5n/BEQDjXsiIY386\n/czYW7Zz2ZxOK67ENaABUxg5w8iqu8wkF0pVHbjBThkEPvvdwWKAFLDC55q1KO4H\nsZLx8U/usUdHW9pz+/C7QW7UEJjKP7LfUWnosz7NJYtb7lXJ6pyLkstlA35/aXv3\nxS4eHxHFExl7hiTPgWuFYZUfhdTYSoUTO7WHI7IIZvAh05I/akrE7RpPXviMdIrI\nluKOGwMDHuKSUX93BfFcm9WyMx2cGvbORAXPonGadkPbNsuSK1YkalZ27x5Aq10T\nwJ6/u29+BMDIRB1qJPf5gm4itQpX0hLKXRAdSPKQgvA2gDN5fIlPDEAlWt3oo5JI\n6aWKaL1zAwSFcV2XE6c0r9ZrQPQw1cTzeAMDzMQ7MnEb6kt/YNdGfzTL/5b+vF+e\nHApck5WMN3G/8qlI5rFGXG5zljlu\n-----END CERTIFICATE-----",
+    "CertificateType": "PEM",
+    "Issuer": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "manager.contoso.org"
+    },
+    "Subject": {
+        "Country": "US",
+        "State": "Oregon",
+        "City": "Portland",
+        "Organization": "Contoso",
+        "OrganizationalUnit": "ABC",
+        "CommonName": "manager.contoso.org"
+    },
+    "ValidNotBefore": "2018-09-07T13:22:05Z",
+    "ValidNotAfter": "2019-09-07T13:22:05Z",
+    "KeyUsage": [
+        "KeyEncipherment",
+        "ServerAuthentication"
+    ],
+    "SerialNumber": "5d:7a:d8:df:f6:fc:c1:b3:ca:fe:fb:cc:38:f3:01:64:51:ea:05:cb",
+    "Fingerprint": "A6:E9:D2:5C:DC:52:DA:4B:3B:14:97:F3:A4:53:D9:99:A1:0B:56:41",
+    "FingerprintHashAlgorithm": "TPM_ALG_SHA1",
+    "SignatureAlgorithm": "sha256WithRSAEncryption",
+    "Actions": {
+        "#Certificate.Rekey": {
+            "target": "/redfish/v1/UpdateService/ClientCertificates/1/Actions/Certificate.Rekey",
+            "@Redfish.ActionInfo": "/redfish/v1/UpdateService/ClientCertificates/1/RekeyActionInfo"
+        },
+        "#Certificate.Renew": {
+            "target": "/redfish/v1/UpdateService/ClientCertificates/1/Actions/Certificate.Renew"
+        }
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/UpdateService/ClientCertificates/1",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/ClientCertificates/index.json b/public-rackmount1/UpdateService/ClientCertificates/index.json
new file mode 100644
index 0000000..a4f4150
--- /dev/null
+++ b/public-rackmount1/UpdateService/ClientCertificates/index.json
@@ -0,0 +1,12 @@
+{
+    "@odata.type": "#CertificateCollection.CertificateCollection",
+    "Name": "Certificate Collection",
+    "Members@odata.count": 1,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/UpdateService/ClientCertificates/1"
+        }
+    ],
+    "@odata.id": "/redfish/v1/UpdateService/ClientCertificates",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/FirmwareInventory/AC-RoT0/index.json b/public-rackmount1/UpdateService/FirmwareInventory/AC-RoT0/index.json
new file mode 100644
index 0000000..7a2fc90
--- /dev/null
+++ b/public-rackmount1/UpdateService/FirmwareInventory/AC-RoT0/index.json
@@ -0,0 +1,18 @@
+{
+    "@odata.type": "#SoftwareInventory.v1_9_0.SoftwareInventory",
+    "Id": "AC-RoT0",
+    "Name": "AC-RoT0 firmware",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Updateable": true,
+    "Version": "1.11",
+    "SoftwareId": "6FC0A31C-FD11-4803-8A35-F3BA2F0E2B6B",
+    "Actions": {
+        "Oem": {}
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/AC-RoT0",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/FirmwareInventory/BIOS/index.json b/public-rackmount1/UpdateService/FirmwareInventory/BIOS/index.json
index 08be43e..24d2ccf 100644
--- a/public-rackmount1/UpdateService/FirmwareInventory/BIOS/index.json
+++ b/public-rackmount1/UpdateService/FirmwareInventory/BIOS/index.json
@@ -1,26 +1,26 @@
-{
-    "@odata.type": "#SoftwareInventory.v1_2_3.SoftwareInventory",
-    "Id": "BIOS",
-    "Name": "Contoso BIOS Firmware",
-    "Status": {
-        "State": "Enabled",
-        "Health": "OK"
-    },
-    "Updateable": true,
-    "Manufacturer": "Contoso",
-    "ReleaseDate": "2017-12-06T12:00:00",
-    "Version": "P79 v1.45",
-    "SoftwareId": "FEE82A67-6CE2-4625-9F44-237AD2402C28",
-    "LowestSupportedVersion": "P79 v1.10",
-    "RelatedItem": [
-        {
-            "@odata.id": "/redfish/v1/Systems/437XR1138R2"
-        }
-    ],
-    "Actions": {
-        "Oem": {}
-    },
-    "Oem": {},
-    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/BIOS",
-    "@Redfish.Copyright": "Copyright 2018-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+{
+    "@odata.type": "#SoftwareInventory.v1_9_0.SoftwareInventory",
+    "Id": "BIOS",
+    "Name": "Contoso BIOS Firmware",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Updateable": true,
+    "Manufacturer": "Contoso",
+    "ReleaseDate": "2017-12-06T12:00:00",
+    "Version": "P79 v1.45",
+    "SoftwareId": "FEE82A67-6CE2-4625-9F44-237AD2402C28",
+    "LowestSupportedVersion": "P79 v1.10",
+    "RelatedItem": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2"
+        }
+    ],
+    "Actions": {
+        "Oem": {}
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/BIOS",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/FirmwareInventory/BMC/index.json b/public-rackmount1/UpdateService/FirmwareInventory/BMC/index.json
index c18bf10..67842b6 100644
--- a/public-rackmount1/UpdateService/FirmwareInventory/BMC/index.json
+++ b/public-rackmount1/UpdateService/FirmwareInventory/BMC/index.json
@@ -1,29 +1,39 @@
-{
-    "@odata.type": "#SoftwareInventory.v1_2_3.SoftwareInventory",
-    "Id": "BMC",
-    "Name": "Contoso BMC Firmware",
-    "Status": {
-        "State": "Enabled",
-        "Health": "OK"
-    },
-    "Updateable": true,
-    "Manufacturer": "Contoso",
-    "ReleaseDate": "2017-08-22T12:00:00",
-    "Version": "1.45.455b66-rev4",
-    "SoftwareId": "1624A9DF-5E13-47FC-874A-DF3AFF143089",
-    "LowestSupportedVersion": "1.30.367a12-rev1",
-    "UefiDevicePaths": [
-        "BMC(0x1,0x0ABCDEF)"
-    ],
-    "RelatedItem": [
-        {
-            "@odata.id": "/redfish/v1/Managers/BMC"
-        }
-    ],
-    "Actions": {
-        "Oem": {}
-    },
-    "Oem": {},
-    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/BMC",
-    "@Redfish.Copyright": "Copyright 2018-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+{
+    "@odata.type": "#SoftwareInventory.v1_9_0.SoftwareInventory",
+    "Id": "BMC",
+    "Name": "Contoso BMC Firmware",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Updateable": true,
+    "Manufacturer": "Contoso",
+    "ReleaseDate": "2017-08-22T12:00:00",
+    "Version": "1.45.455b66-rev4",
+    "SoftwareId": "1624A9DF-5E13-47FC-874A-DF3AFF143089",
+    "LowestSupportedVersion": "1.30.367a12-rev1",
+    "UefiDevicePaths": [
+        "BMC(0x1,0x0ABCDEF)"
+    ],
+    "AdditionalVersions": {
+        "Bootloader": "v2022.01",
+        "Kernel": "Linux 5.13.0-30-generic arm71",
+        "Oem": {
+            "Contoso": {
+                "@odata.type": "#ContosoSoftwareInventory.v1_0_0.AdditionalVersions",
+                "ManagementApp": "1.30"
+            }
+        }
+    },
+    "RelatedItem": [
+        {
+            "@odata.id": "/redfish/v1/Managers/BMC"
+        }
+    ],
+    "Actions": {
+        "Oem": {}
+    },
+    "Oem": {},
+    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/BMC",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/FirmwareInventory/SS/index.json b/public-rackmount1/UpdateService/FirmwareInventory/SS/index.json
new file mode 100644
index 0000000..fb58d01
--- /dev/null
+++ b/public-rackmount1/UpdateService/FirmwareInventory/SS/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.type": "#SoftwareInventory.v1_9_0.SoftwareInventory",
+    "Id": "SS",
+    "Name": "Contoso Simple Storage Firmware",
+    "Status": {
+        "State": "Enabled",
+        "Health": "OK"
+    },
+    "Updateable": true,
+    "Manufacturer": "Contoso",
+    "ReleaseDate": "2021-10-18T12:00:00",
+    "Version": "2.50",
+    "LowestSupportedVersion": "2.30.rev1",
+    "RelatedItem": [
+        {
+            "@odata.id": "/redfish/v1/Systems/437XR1138R2/SimpleStorage/1"
+        }
+    ],
+    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/SS",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/FirmwareInventory/index.json b/public-rackmount1/UpdateService/FirmwareInventory/index.json
index f7529e3..dc489c1 100644
--- a/public-rackmount1/UpdateService/FirmwareInventory/index.json
+++ b/public-rackmount1/UpdateService/FirmwareInventory/index.json
@@ -1,15 +1,18 @@
-{
-    "@odata.type": "#SoftwareInventoryCollection.SoftwareInventoryCollection",
-    "Name": "Firmware Collection",
-    "Members@odata.count": 2,
-    "Members": [
-        {
-            "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/BMC"
-        },
-        {
-            "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/BIOS"
-        }
-    ],
-    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory",
-    "@Redfish.Copyright": "Copyright 2018-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+{
+    "@odata.type": "#SoftwareInventoryCollection.SoftwareInventoryCollection",
+    "Name": "Firmware Collection",
+    "Members@odata.count": 2,
+    "Members": [
+        {
+            "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/BMC"
+        },
+        {
+            "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/SS"
+        },
+        {
+            "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory/BIOS"
+        }
+    ],
+    "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/SimpleUpdateActionInfo/index.json b/public-rackmount1/UpdateService/SimpleUpdateActionInfo/index.json
index 4f8a5c1..1126646 100644
--- a/public-rackmount1/UpdateService/SimpleUpdateActionInfo/index.json
+++ b/public-rackmount1/UpdateService/SimpleUpdateActionInfo/index.json
@@ -1,38 +1,38 @@
-{
-    "@odata.type": "#ActionInfo.v1_1_2.ActionInfo",
-    "Id": "SimpleUpdateActionInfo",
-    "Name": "Simple Update Action Info",
-    "Parameters": [
-        {
-            "Name": "ImageURI",
-            "Required": true,
-            "DataType": "String"
-        },
-        {
-            "Name": "TransferProtocol",
-            "Required": false,
-            "DataType": "String",
-            "AllowableValues": [
-                "FTP",
-                "SFTP",
-                "HTTP",
-                "HTTPS",
-                "SCP",
-                "TFTP"
-            ]
-        },
-        {
-            "Name": "Username",
-            "Required": false,
-            "DataType": "String"
-        },
-        {
-            "Name": "Password",
-            "Required": false,
-            "DataType": "String"
-        }
-    ],
-    "Oem": {},
-    "@odata.id": "/redfish/v1/UpdateService/SimpleUpdateActionInfo",
-    "@Redfish.Copyright": "Copyright 2018-2019 DMTF. All rights reserved."
-}
+{
+    "@odata.type": "#ActionInfo.v1_3_0.ActionInfo",
+    "Id": "SimpleUpdateActionInfo",
+    "Name": "Simple Update Action Info",
+    "Parameters": [
+        {
+            "Name": "ImageURI",
+            "Required": true,
+            "DataType": "String"
+        },
+        {
+            "Name": "TransferProtocol",
+            "Required": false,
+            "DataType": "String",
+            "AllowableValues": [
+                "FTP",
+                "SFTP",
+                "HTTP",
+                "HTTPS",
+                "SCP",
+                "TFTP"
+            ]
+        },
+        {
+            "Name": "Username",
+            "Required": false,
+            "DataType": "String"
+        },
+        {
+            "Name": "Password",
+            "Required": false,
+            "DataType": "String"
+        }
+    ],
+    "Oem": {},
+    "@odata.id": "/redfish/v1/UpdateService/SimpleUpdateActionInfo",
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/UpdateService/index.json b/public-rackmount1/UpdateService/index.json
index 7436e5d..77db09d 100644
--- a/public-rackmount1/UpdateService/index.json
+++ b/public-rackmount1/UpdateService/index.json
@@ -1,5 +1,5 @@
 {
-    "@odata.type": "#UpdateService.v1_8_0.UpdateService",
+    "@odata.type": "#UpdateService.v1_11_2.UpdateService",
     "Id": "UpdateService",
     "Name": "Update service",
     "Status": {
@@ -26,6 +26,9 @@
     "FirmwareInventory": {
         "@odata.id": "/redfish/v1/UpdateService/FirmwareInventory"
     },
+    "ClientCertificates": {
+        "@odata.id": "/redfish/v1/UpdateService/ClientCertificates"
+    },
     "Actions": {
         "#UpdateService.SimpleUpdate": {
             "target": "/redfish/v1/UpdateService/Actions/SimpleUpdate",
@@ -35,5 +38,5 @@
     },
     "Oem": {},
     "@odata.id": "/redfish/v1/UpdateService",
-    "@Redfish.Copyright": "Copyright 2018-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
\ No newline at end of file
diff --git a/public-rackmount1/index.json b/public-rackmount1/index.json
index 0172663..9b319c8 100644
--- a/public-rackmount1/index.json
+++ b/public-rackmount1/index.json
@@ -1,9 +1,22 @@
 {
-    "@odata.type": "#ServiceRoot.v1_6_0.ServiceRoot",
+    "@odata.type": "#ServiceRoot.v1_15_0.ServiceRoot",
     "Id": "RootService",
     "Name": "Root Service",
-    "RedfishVersion": "1.6.0",
+    "RedfishVersion": "1.15.0",
     "UUID": "92384634-2938-2342-8820-489239905423",
+    "ProtocolFeaturesSupported": {
+        "ExpandQuery": {
+            "ExpandAll": true,
+            "Levels": true,
+            "MaxLevels": 6,
+            "Links": true,
+            "NoLinks": true
+        },
+        "SelectQuery": false,
+        "FilterQuery": false,
+        "OnlyMemberQuery": true,
+        "ExcerptQuery": true
+    },
     "Systems": {
         "@odata.id": "/redfish/v1/Systems"
     },
@@ -34,12 +47,18 @@
     "CertificateService": {
         "@odata.id": "/redfish/v1/CertificateService"
     },
+    "KeyService": {
+        "@odata.id": "/redfish/v1/KeyService"
+    },
     "Links": {
         "Sessions": {
             "@odata.id": "/redfish/v1/SessionService/Sessions"
         }
     },
+    "ComponentIntegrity": {
+        "@odata.id": "/redfish/v1/ComponentIntegrity"
+    },
     "Oem": {},
     "@odata.id": "/redfish/v1/",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
-}
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+}
\ No newline at end of file
diff --git a/public-rackmount1/odata/index.json b/public-rackmount1/odata/index.json
index a69e9f5..77a51f7 100644
--- a/public-rackmount1/odata/index.json
+++ b/public-rackmount1/odata/index.json
@@ -1,4 +1,5 @@
 {
+    "@odata.context": "/redfish/v1/$metadata",
     "value": [
         {
             "name": "Service",
@@ -50,6 +51,11 @@
             "kind": "Singleton",
             "url": "/redfish/v1/CertificateService"
         },
+        {
+            "name": "KeyService",
+            "kind": "Singleton",
+            "url": "/redfish/v1/KeyService"
+        },
         {
             "name": "UpdateService",
             "kind": "Singleton",
@@ -61,6 +67,5 @@
             "url": "/redfish/v1/SessionService/Sessions"
         }
     ],
-    "@odata.context": "/redfish/v1/$metadata",
-    "@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
+    "@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
 }
\ No newline at end of file