diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 517fd92..43d563a 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -12,7 +12,7 @@
 
 import xml.etree.ElementTree as ET
 
-VERSION = "DSP8010_2020.3"
+VERSION = "DSP8010_2020.4"
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml
index e7f9d6d..da03e17 100644
--- a/static/redfish/v1/$metadata/index.xml
+++ b/static/redfish/v1/$metadata/index.xml
@@ -5,6 +5,7 @@
         <edmx:Include Namespace="AccelerationFunction.v1_0_0"/>
         <edmx:Include Namespace="AccelerationFunction.v1_0_1"/>
         <edmx:Include Namespace="AccelerationFunction.v1_0_2"/>
+        <edmx:Include Namespace="AccelerationFunction.v1_0_3"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/AccelerationFunctionCollection_v1.xml">
         <edmx:Include Namespace="AccelerationFunctionCollection"/>
@@ -21,6 +22,7 @@
         <edmx:Include Namespace="AccountService.v1_0_8"/>
         <edmx:Include Namespace="AccountService.v1_0_9"/>
         <edmx:Include Namespace="AccountService.v1_0_10"/>
+        <edmx:Include Namespace="AccountService.v1_0_11"/>
         <edmx:Include Namespace="AccountService.v1_1_0"/>
         <edmx:Include Namespace="AccountService.v1_1_1"/>
         <edmx:Include Namespace="AccountService.v1_1_2"/>
@@ -29,6 +31,7 @@
         <edmx:Include Namespace="AccountService.v1_1_5"/>
         <edmx:Include Namespace="AccountService.v1_1_6"/>
         <edmx:Include Namespace="AccountService.v1_1_7"/>
+        <edmx:Include Namespace="AccountService.v1_1_8"/>
         <edmx:Include Namespace="AccountService.v1_2_0"/>
         <edmx:Include Namespace="AccountService.v1_2_1"/>
         <edmx:Include Namespace="AccountService.v1_2_2"/>
@@ -37,27 +40,35 @@
         <edmx:Include Namespace="AccountService.v1_2_5"/>
         <edmx:Include Namespace="AccountService.v1_2_6"/>
         <edmx:Include Namespace="AccountService.v1_2_7"/>
+        <edmx:Include Namespace="AccountService.v1_2_8"/>
         <edmx:Include Namespace="AccountService.v1_3_0"/>
         <edmx:Include Namespace="AccountService.v1_3_1"/>
         <edmx:Include Namespace="AccountService.v1_3_2"/>
         <edmx:Include Namespace="AccountService.v1_3_3"/>
         <edmx:Include Namespace="AccountService.v1_3_4"/>
         <edmx:Include Namespace="AccountService.v1_3_5"/>
+        <edmx:Include Namespace="AccountService.v1_3_6"/>
+        <edmx:Include Namespace="AccountService.v1_3_7"/>
         <edmx:Include Namespace="AccountService.v1_4_0"/>
         <edmx:Include Namespace="AccountService.v1_4_1"/>
         <edmx:Include Namespace="AccountService.v1_4_2"/>
         <edmx:Include Namespace="AccountService.v1_4_3"/>
         <edmx:Include Namespace="AccountService.v1_4_4"/>
+        <edmx:Include Namespace="AccountService.v1_4_5"/>
         <edmx:Include Namespace="AccountService.v1_5_0"/>
         <edmx:Include Namespace="AccountService.v1_5_1"/>
         <edmx:Include Namespace="AccountService.v1_5_2"/>
         <edmx:Include Namespace="AccountService.v1_5_3"/>
+        <edmx:Include Namespace="AccountService.v1_5_4"/>
         <edmx:Include Namespace="AccountService.v1_6_0"/>
         <edmx:Include Namespace="AccountService.v1_6_1"/>
         <edmx:Include Namespace="AccountService.v1_6_2"/>
+        <edmx:Include Namespace="AccountService.v1_6_3"/>
         <edmx:Include Namespace="AccountService.v1_7_0"/>
         <edmx:Include Namespace="AccountService.v1_7_1"/>
         <edmx:Include Namespace="AccountService.v1_7_2"/>
+        <edmx:Include Namespace="AccountService.v1_7_3"/>
+        <edmx:Include Namespace="AccountService.v1_8_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ActionInfo_v1.xml">
         <edmx:Include Namespace="ActionInfo"/>
@@ -76,7 +87,9 @@
         <edmx:Include Namespace="AddressPool"/>
         <edmx:Include Namespace="AddressPool.v1_0_0"/>
         <edmx:Include Namespace="AddressPool.v1_0_1"/>
+        <edmx:Include Namespace="AddressPool.v1_0_2"/>
         <edmx:Include Namespace="AddressPool.v1_1_0"/>
+        <edmx:Include Namespace="AddressPool.v1_1_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/AddressPoolCollection_v1.xml">
         <edmx:Include Namespace="AddressPoolCollection"/>
@@ -84,6 +97,7 @@
     <edmx:Reference Uri="/redfish/v1/schema/Aggregate_v1.xml">
         <edmx:Include Namespace="Aggregate"/>
         <edmx:Include Namespace="Aggregate.v1_0_0"/>
+        <edmx:Include Namespace="Aggregate.v1_0_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/AggregateCollection_v1.xml">
         <edmx:Include Namespace="AggregateCollection"/>
@@ -91,10 +105,12 @@
     <edmx:Reference Uri="/redfish/v1/schema/AggregationService_v1.xml">
         <edmx:Include Namespace="AggregationService"/>
         <edmx:Include Namespace="AggregationService.v1_0_0"/>
+        <edmx:Include Namespace="AggregationService.v1_0_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/AggregationSource_v1.xml">
         <edmx:Include Namespace="AggregationSource"/>
         <edmx:Include Namespace="AggregationSource.v1_0_0"/>
+        <edmx:Include Namespace="AggregationSource.v1_1_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/AggregationSourceCollection_v1.xml">
         <edmx:Include Namespace="AggregationSourceCollection"/>
@@ -129,6 +145,7 @@
         <edmx:Include Namespace="AttributeRegistry.v1_0_7"/>
         <edmx:Include Namespace="AttributeRegistry.v1_0_8"/>
         <edmx:Include Namespace="AttributeRegistry.v1_0_9"/>
+        <edmx:Include Namespace="AttributeRegistry.v1_0_10"/>
         <edmx:Include Namespace="AttributeRegistry.v1_1_0"/>
         <edmx:Include Namespace="AttributeRegistry.v1_1_1"/>
         <edmx:Include Namespace="AttributeRegistry.v1_1_2"/>
@@ -138,6 +155,7 @@
         <edmx:Include Namespace="AttributeRegistry.v1_1_6"/>
         <edmx:Include Namespace="AttributeRegistry.v1_1_7"/>
         <edmx:Include Namespace="AttributeRegistry.v1_1_8"/>
+        <edmx:Include Namespace="AttributeRegistry.v1_1_9"/>
         <edmx:Include Namespace="AttributeRegistry.v1_2_0"/>
         <edmx:Include Namespace="AttributeRegistry.v1_2_1"/>
         <edmx:Include Namespace="AttributeRegistry.v1_2_2"/>
@@ -145,11 +163,13 @@
         <edmx:Include Namespace="AttributeRegistry.v1_2_4"/>
         <edmx:Include Namespace="AttributeRegistry.v1_2_5"/>
         <edmx:Include Namespace="AttributeRegistry.v1_2_6"/>
+        <edmx:Include Namespace="AttributeRegistry.v1_2_7"/>
         <edmx:Include Namespace="AttributeRegistry.v1_3_0"/>
         <edmx:Include Namespace="AttributeRegistry.v1_3_1"/>
         <edmx:Include Namespace="AttributeRegistry.v1_3_2"/>
         <edmx:Include Namespace="AttributeRegistry.v1_3_3"/>
         <edmx:Include Namespace="AttributeRegistry.v1_3_4"/>
+        <edmx:Include Namespace="AttributeRegistry.v1_3_5"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Bios_v1.xml">
         <edmx:Include Namespace="Bios"/>
@@ -182,11 +202,14 @@
         <edmx:Include Namespace="Certificate.v1_0_1"/>
         <edmx:Include Namespace="Certificate.v1_0_2"/>
         <edmx:Include Namespace="Certificate.v1_0_3"/>
+        <edmx:Include Namespace="Certificate.v1_0_4"/>
         <edmx:Include Namespace="Certificate.v1_1_0"/>
         <edmx:Include Namespace="Certificate.v1_1_1"/>
         <edmx:Include Namespace="Certificate.v1_1_2"/>
+        <edmx:Include Namespace="Certificate.v1_1_3"/>
         <edmx:Include Namespace="Certificate.v1_2_0"/>
         <edmx:Include Namespace="Certificate.v1_2_1"/>
+        <edmx:Include Namespace="Certificate.v1_2_2"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/CertificateCollection_v1.xml">
         <edmx:Include Namespace="CertificateCollection"/>
@@ -203,6 +226,7 @@
         <edmx:Include Namespace="CertificateService.v1_0_1"/>
         <edmx:Include Namespace="CertificateService.v1_0_2"/>
         <edmx:Include Namespace="CertificateService.v1_0_3"/>
+        <edmx:Include Namespace="CertificateService.v1_0_4"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Chassis_v1.xml">
         <edmx:Include Namespace="Chassis"/>
@@ -321,6 +345,7 @@
         <edmx:Include Namespace="Chassis.v1_13_0"/>
         <edmx:Include Namespace="Chassis.v1_13_1"/>
         <edmx:Include Namespace="Chassis.v1_14_0"/>
+        <edmx:Include Namespace="Chassis.v1_15_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ChassisCollection_v1.xml">
         <edmx:Include Namespace="ChassisCollection"/>
@@ -329,7 +354,10 @@
         <edmx:Include Namespace="Circuit"/>
         <edmx:Include Namespace="Circuit.v1_0_0"/>
         <edmx:Include Namespace="Circuit.v1_0_1"/>
+        <edmx:Include Namespace="Circuit.v1_0_2"/>
         <edmx:Include Namespace="Circuit.v1_1_0"/>
+        <edmx:Include Namespace="Circuit.v1_1_1"/>
+        <edmx:Include Namespace="Circuit.v1_2_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/CircuitCollection_v1.xml">
         <edmx:Include Namespace="CircuitCollection"/>
@@ -347,6 +375,7 @@
         <edmx:Include Namespace="CollectionCapabilities.v1_1_3"/>
         <edmx:Include Namespace="CollectionCapabilities.v1_2_0"/>
         <edmx:Include Namespace="CollectionCapabilities.v1_2_1"/>
+        <edmx:Include Namespace="CollectionCapabilities.v1_2_2"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/CompositionService_v1.xml">
         <edmx:Include Namespace="CompositionService"/>
@@ -377,6 +406,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_0_13"/>
         <edmx:Include Namespace="ComputerSystem.v1_0_14"/>
         <edmx:Include Namespace="ComputerSystem.v1_0_15"/>
+        <edmx:Include Namespace="ComputerSystem.v1_0_16"/>
         <edmx:Include Namespace="ComputerSystem.v1_1_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_1_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_1_2"/>
@@ -391,6 +421,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_1_11"/>
         <edmx:Include Namespace="ComputerSystem.v1_1_12"/>
         <edmx:Include Namespace="ComputerSystem.v1_1_13"/>
+        <edmx:Include Namespace="ComputerSystem.v1_1_14"/>
         <edmx:Include Namespace="ComputerSystem.v1_2_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_2_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_2_2"/>
@@ -404,6 +435,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_2_10"/>
         <edmx:Include Namespace="ComputerSystem.v1_2_11"/>
         <edmx:Include Namespace="ComputerSystem.v1_2_12"/>
+        <edmx:Include Namespace="ComputerSystem.v1_2_13"/>
         <edmx:Include Namespace="ComputerSystem.v1_3_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_3_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_3_2"/>
@@ -416,6 +448,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_3_9"/>
         <edmx:Include Namespace="ComputerSystem.v1_3_10"/>
         <edmx:Include Namespace="ComputerSystem.v1_3_11"/>
+        <edmx:Include Namespace="ComputerSystem.v1_3_12"/>
         <edmx:Include Namespace="ComputerSystem.v1_4_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_4_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_4_2"/>
@@ -427,6 +460,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_4_8"/>
         <edmx:Include Namespace="ComputerSystem.v1_4_9"/>
         <edmx:Include Namespace="ComputerSystem.v1_4_10"/>
+        <edmx:Include Namespace="ComputerSystem.v1_4_11"/>
         <edmx:Include Namespace="ComputerSystem.v1_5_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_5_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_5_2"/>
@@ -436,6 +470,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_5_6"/>
         <edmx:Include Namespace="ComputerSystem.v1_5_7"/>
         <edmx:Include Namespace="ComputerSystem.v1_5_8"/>
+        <edmx:Include Namespace="ComputerSystem.v1_5_9"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_2"/>
@@ -443,32 +478,41 @@
         <edmx:Include Namespace="ComputerSystem.v1_6_4"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_5"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_6"/>
+        <edmx:Include Namespace="ComputerSystem.v1_6_7"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_2"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_3"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_4"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_5"/>
+        <edmx:Include Namespace="ComputerSystem.v1_7_6"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_2"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_3"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_4"/>
+        <edmx:Include Namespace="ComputerSystem.v1_8_5"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_2"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_3"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_4"/>
+        <edmx:Include Namespace="ComputerSystem.v1_9_5"/>
         <edmx:Include Namespace="ComputerSystem.v1_10_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_10_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_10_2"/>
         <edmx:Include Namespace="ComputerSystem.v1_10_3"/>
+        <edmx:Include Namespace="ComputerSystem.v1_10_4"/>
         <edmx:Include Namespace="ComputerSystem.v1_11_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_11_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_11_2"/>
+        <edmx:Include Namespace="ComputerSystem.v1_11_3"/>
         <edmx:Include Namespace="ComputerSystem.v1_12_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_12_1"/>
+        <edmx:Include Namespace="ComputerSystem.v1_12_2"/>
         <edmx:Include Namespace="ComputerSystem.v1_13_0"/>
+        <edmx:Include Namespace="ComputerSystem.v1_13_1"/>
+        <edmx:Include Namespace="ComputerSystem.v1_14_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ComputerSystemCollection_v1.xml">
         <edmx:Include Namespace="ComputerSystemCollection"/>
@@ -500,6 +544,7 @@
         <edmx:Include Namespace="Drive.v1_0_8"/>
         <edmx:Include Namespace="Drive.v1_0_9"/>
         <edmx:Include Namespace="Drive.v1_0_10"/>
+        <edmx:Include Namespace="Drive.v1_0_11"/>
         <edmx:Include Namespace="Drive.v1_1_0"/>
         <edmx:Include Namespace="Drive.v1_1_1"/>
         <edmx:Include Namespace="Drive.v1_1_2"/>
@@ -510,6 +555,7 @@
         <edmx:Include Namespace="Drive.v1_1_7"/>
         <edmx:Include Namespace="Drive.v1_1_8"/>
         <edmx:Include Namespace="Drive.v1_1_9"/>
+        <edmx:Include Namespace="Drive.v1_1_10"/>
         <edmx:Include Namespace="Drive.v1_2_0"/>
         <edmx:Include Namespace="Drive.v1_2_1"/>
         <edmx:Include Namespace="Drive.v1_2_2"/>
@@ -518,6 +564,7 @@
         <edmx:Include Namespace="Drive.v1_2_5"/>
         <edmx:Include Namespace="Drive.v1_2_6"/>
         <edmx:Include Namespace="Drive.v1_2_7"/>
+        <edmx:Include Namespace="Drive.v1_2_8"/>
         <edmx:Include Namespace="Drive.v1_3_0"/>
         <edmx:Include Namespace="Drive.v1_3_1"/>
         <edmx:Include Namespace="Drive.v1_3_2"/>
@@ -525,6 +572,7 @@
         <edmx:Include Namespace="Drive.v1_3_4"/>
         <edmx:Include Namespace="Drive.v1_3_5"/>
         <edmx:Include Namespace="Drive.v1_3_6"/>
+        <edmx:Include Namespace="Drive.v1_3_7"/>
         <edmx:Include Namespace="Drive.v1_4_0"/>
         <edmx:Include Namespace="Drive.v1_4_1"/>
         <edmx:Include Namespace="Drive.v1_4_2"/>
@@ -532,27 +580,36 @@
         <edmx:Include Namespace="Drive.v1_4_4"/>
         <edmx:Include Namespace="Drive.v1_4_5"/>
         <edmx:Include Namespace="Drive.v1_4_6"/>
+        <edmx:Include Namespace="Drive.v1_4_7"/>
         <edmx:Include Namespace="Drive.v1_5_0"/>
         <edmx:Include Namespace="Drive.v1_5_1"/>
         <edmx:Include Namespace="Drive.v1_5_2"/>
         <edmx:Include Namespace="Drive.v1_5_3"/>
         <edmx:Include Namespace="Drive.v1_5_4"/>
         <edmx:Include Namespace="Drive.v1_5_5"/>
+        <edmx:Include Namespace="Drive.v1_5_6"/>
         <edmx:Include Namespace="Drive.v1_6_0"/>
         <edmx:Include Namespace="Drive.v1_6_1"/>
         <edmx:Include Namespace="Drive.v1_6_2"/>
         <edmx:Include Namespace="Drive.v1_6_3"/>
+        <edmx:Include Namespace="Drive.v1_6_4"/>
         <edmx:Include Namespace="Drive.v1_7_0"/>
         <edmx:Include Namespace="Drive.v1_7_1"/>
         <edmx:Include Namespace="Drive.v1_7_2"/>
+        <edmx:Include Namespace="Drive.v1_7_3"/>
         <edmx:Include Namespace="Drive.v1_8_0"/>
         <edmx:Include Namespace="Drive.v1_8_1"/>
         <edmx:Include Namespace="Drive.v1_8_2"/>
+        <edmx:Include Namespace="Drive.v1_8_3"/>
         <edmx:Include Namespace="Drive.v1_9_0"/>
         <edmx:Include Namespace="Drive.v1_9_1"/>
         <edmx:Include Namespace="Drive.v1_9_2"/>
+        <edmx:Include Namespace="Drive.v1_9_3"/>
         <edmx:Include Namespace="Drive.v1_10_0"/>
+        <edmx:Include Namespace="Drive.v1_10_1"/>
         <edmx:Include Namespace="Drive.v1_11_0"/>
+        <edmx:Include Namespace="Drive.v1_11_1"/>
+        <edmx:Include Namespace="Drive.v1_12_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/DriveCollection_v1.xml">
         <edmx:Include Namespace="DriveCollection"/>
@@ -569,6 +626,7 @@
         <edmx:Include Namespace="Endpoint.v1_0_7"/>
         <edmx:Include Namespace="Endpoint.v1_0_8"/>
         <edmx:Include Namespace="Endpoint.v1_0_9"/>
+        <edmx:Include Namespace="Endpoint.v1_0_10"/>
         <edmx:Include Namespace="Endpoint.v1_1_0"/>
         <edmx:Include Namespace="Endpoint.v1_1_1"/>
         <edmx:Include Namespace="Endpoint.v1_1_2"/>
@@ -576,21 +634,26 @@
         <edmx:Include Namespace="Endpoint.v1_1_4"/>
         <edmx:Include Namespace="Endpoint.v1_1_5"/>
         <edmx:Include Namespace="Endpoint.v1_1_6"/>
+        <edmx:Include Namespace="Endpoint.v1_1_7"/>
         <edmx:Include Namespace="Endpoint.v1_2_0"/>
         <edmx:Include Namespace="Endpoint.v1_2_1"/>
         <edmx:Include Namespace="Endpoint.v1_2_2"/>
         <edmx:Include Namespace="Endpoint.v1_2_3"/>
         <edmx:Include Namespace="Endpoint.v1_2_4"/>
         <edmx:Include Namespace="Endpoint.v1_2_5"/>
+        <edmx:Include Namespace="Endpoint.v1_2_6"/>
         <edmx:Include Namespace="Endpoint.v1_3_0"/>
         <edmx:Include Namespace="Endpoint.v1_3_1"/>
         <edmx:Include Namespace="Endpoint.v1_3_2"/>
         <edmx:Include Namespace="Endpoint.v1_3_3"/>
         <edmx:Include Namespace="Endpoint.v1_3_4"/>
+        <edmx:Include Namespace="Endpoint.v1_3_5"/>
         <edmx:Include Namespace="Endpoint.v1_4_0"/>
         <edmx:Include Namespace="Endpoint.v1_4_1"/>
         <edmx:Include Namespace="Endpoint.v1_4_2"/>
+        <edmx:Include Namespace="Endpoint.v1_4_3"/>
         <edmx:Include Namespace="Endpoint.v1_5_0"/>
+        <edmx:Include Namespace="Endpoint.v1_5_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/EndpointCollection_v1.xml">
         <edmx:Include Namespace="EndpointCollection"/>
@@ -601,19 +664,27 @@
         <edmx:Include Namespace="EndpointGroup.v1_0_1"/>
         <edmx:Include Namespace="EndpointGroup.v1_0_2"/>
         <edmx:Include Namespace="EndpointGroup.v1_0_3"/>
+        <edmx:Include Namespace="EndpointGroup.v1_0_4"/>
         <edmx:Include Namespace="EndpointGroup.v1_1_0"/>
         <edmx:Include Namespace="EndpointGroup.v1_1_1"/>
         <edmx:Include Namespace="EndpointGroup.v1_1_2"/>
         <edmx:Include Namespace="EndpointGroup.v1_1_3"/>
         <edmx:Include Namespace="EndpointGroup.v1_1_4"/>
+        <edmx:Include Namespace="EndpointGroup.v1_1_5"/>
         <edmx:Include Namespace="EndpointGroup.v1_2_0"/>
         <edmx:Include Namespace="EndpointGroup.v1_2_1"/>
         <edmx:Include Namespace="EndpointGroup.v1_2_2"/>
+        <edmx:Include Namespace="EndpointGroup.v1_2_3"/>
         <edmx:Include Namespace="EndpointGroup.v1_3_0"/>
+        <edmx:Include Namespace="EndpointGroup.v1_3_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/EndpointGroupCollection_v1.xml">
         <edmx:Include Namespace="EndpointGroupCollection"/>
     </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/EnvironmentMetrics_v1.xml">
+        <edmx:Include Namespace="EnvironmentMetrics"/>
+        <edmx:Include Namespace="EnvironmentMetrics.v1_0_0"/>
+    </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/EthernetInterface_v1.xml">
         <edmx:Include Namespace="EthernetInterface"/>
         <edmx:Include Namespace="EthernetInterface.v1_0_0"/>
@@ -627,6 +698,7 @@
         <edmx:Include Namespace="EthernetInterface.v1_0_9"/>
         <edmx:Include Namespace="EthernetInterface.v1_0_10"/>
         <edmx:Include Namespace="EthernetInterface.v1_0_11"/>
+        <edmx:Include Namespace="EthernetInterface.v1_0_12"/>
         <edmx:Include Namespace="EthernetInterface.v1_1_0"/>
         <edmx:Include Namespace="EthernetInterface.v1_1_1"/>
         <edmx:Include Namespace="EthernetInterface.v1_1_2"/>
@@ -637,6 +709,7 @@
         <edmx:Include Namespace="EthernetInterface.v1_1_7"/>
         <edmx:Include Namespace="EthernetInterface.v1_1_8"/>
         <edmx:Include Namespace="EthernetInterface.v1_1_9"/>
+        <edmx:Include Namespace="EthernetInterface.v1_1_10"/>
         <edmx:Include Namespace="EthernetInterface.v1_2_0"/>
         <edmx:Include Namespace="EthernetInterface.v1_2_1"/>
         <edmx:Include Namespace="EthernetInterface.v1_2_2"/>
@@ -646,6 +719,7 @@
         <edmx:Include Namespace="EthernetInterface.v1_2_6"/>
         <edmx:Include Namespace="EthernetInterface.v1_2_7"/>
         <edmx:Include Namespace="EthernetInterface.v1_2_8"/>
+        <edmx:Include Namespace="EthernetInterface.v1_2_9"/>
         <edmx:Include Namespace="EthernetInterface.v1_3_0"/>
         <edmx:Include Namespace="EthernetInterface.v1_3_1"/>
         <edmx:Include Namespace="EthernetInterface.v1_3_2"/>
@@ -654,6 +728,7 @@
         <edmx:Include Namespace="EthernetInterface.v1_3_5"/>
         <edmx:Include Namespace="EthernetInterface.v1_3_6"/>
         <edmx:Include Namespace="EthernetInterface.v1_3_7"/>
+        <edmx:Include Namespace="EthernetInterface.v1_3_8"/>
         <edmx:Include Namespace="EthernetInterface.v1_4_0"/>
         <edmx:Include Namespace="EthernetInterface.v1_4_1"/>
         <edmx:Include Namespace="EthernetInterface.v1_4_2"/>
@@ -661,14 +736,17 @@
         <edmx:Include Namespace="EthernetInterface.v1_4_4"/>
         <edmx:Include Namespace="EthernetInterface.v1_4_5"/>
         <edmx:Include Namespace="EthernetInterface.v1_4_6"/>
+        <edmx:Include Namespace="EthernetInterface.v1_4_7"/>
         <edmx:Include Namespace="EthernetInterface.v1_5_0"/>
         <edmx:Include Namespace="EthernetInterface.v1_5_1"/>
         <edmx:Include Namespace="EthernetInterface.v1_5_2"/>
         <edmx:Include Namespace="EthernetInterface.v1_5_3"/>
         <edmx:Include Namespace="EthernetInterface.v1_5_4"/>
+        <edmx:Include Namespace="EthernetInterface.v1_5_5"/>
         <edmx:Include Namespace="EthernetInterface.v1_6_0"/>
         <edmx:Include Namespace="EthernetInterface.v1_6_1"/>
         <edmx:Include Namespace="EthernetInterface.v1_6_2"/>
+        <edmx:Include Namespace="EthernetInterface.v1_6_3"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/EthernetInterfaceCollection_v1.xml">
         <edmx:Include Namespace="EthernetInterfaceCollection"/>
@@ -687,6 +765,7 @@
         <edmx:Include Namespace="Event.v1_0_10"/>
         <edmx:Include Namespace="Event.v1_0_11"/>
         <edmx:Include Namespace="Event.v1_0_12"/>
+        <edmx:Include Namespace="Event.v1_0_13"/>
         <edmx:Include Namespace="Event.v1_1_0"/>
         <edmx:Include Namespace="Event.v1_1_1"/>
         <edmx:Include Namespace="Event.v1_1_2"/>
@@ -698,6 +777,7 @@
         <edmx:Include Namespace="Event.v1_1_8"/>
         <edmx:Include Namespace="Event.v1_1_9"/>
         <edmx:Include Namespace="Event.v1_1_10"/>
+        <edmx:Include Namespace="Event.v1_1_11"/>
         <edmx:Include Namespace="Event.v1_2_0"/>
         <edmx:Include Namespace="Event.v1_2_1"/>
         <edmx:Include Namespace="Event.v1_2_2"/>
@@ -706,19 +786,24 @@
         <edmx:Include Namespace="Event.v1_2_5"/>
         <edmx:Include Namespace="Event.v1_2_6"/>
         <edmx:Include Namespace="Event.v1_2_7"/>
+        <edmx:Include Namespace="Event.v1_2_8"/>
         <edmx:Include Namespace="Event.v1_3_0"/>
         <edmx:Include Namespace="Event.v1_3_1"/>
         <edmx:Include Namespace="Event.v1_3_2"/>
         <edmx:Include Namespace="Event.v1_3_3"/>
         <edmx:Include Namespace="Event.v1_3_4"/>
         <edmx:Include Namespace="Event.v1_3_5"/>
+        <edmx:Include Namespace="Event.v1_3_6"/>
         <edmx:Include Namespace="Event.v1_4_0"/>
         <edmx:Include Namespace="Event.v1_4_1"/>
         <edmx:Include Namespace="Event.v1_4_2"/>
         <edmx:Include Namespace="Event.v1_4_3"/>
+        <edmx:Include Namespace="Event.v1_4_4"/>
         <edmx:Include Namespace="Event.v1_5_0"/>
         <edmx:Include Namespace="Event.v1_5_1"/>
+        <edmx:Include Namespace="Event.v1_5_2"/>
         <edmx:Include Namespace="Event.v1_6_0"/>
+        <edmx:Include Namespace="Event.v1_6_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/EventDestination_v1.xml">
         <edmx:Include Namespace="EventDestination"/>
@@ -730,6 +815,7 @@
         <edmx:Include Namespace="EventDestination.v1_0_6"/>
         <edmx:Include Namespace="EventDestination.v1_0_7"/>
         <edmx:Include Namespace="EventDestination.v1_0_8"/>
+        <edmx:Include Namespace="EventDestination.v1_0_9"/>
         <edmx:Include Namespace="EventDestination.v1_1_0"/>
         <edmx:Include Namespace="EventDestination.v1_1_1"/>
         <edmx:Include Namespace="EventDestination.v1_1_2"/>
@@ -738,28 +824,38 @@
         <edmx:Include Namespace="EventDestination.v1_1_5"/>
         <edmx:Include Namespace="EventDestination.v1_1_6"/>
         <edmx:Include Namespace="EventDestination.v1_1_7"/>
+        <edmx:Include Namespace="EventDestination.v1_1_8"/>
         <edmx:Include Namespace="EventDestination.v1_2_0"/>
         <edmx:Include Namespace="EventDestination.v1_2_1"/>
         <edmx:Include Namespace="EventDestination.v1_2_2"/>
         <edmx:Include Namespace="EventDestination.v1_2_3"/>
         <edmx:Include Namespace="EventDestination.v1_2_4"/>
         <edmx:Include Namespace="EventDestination.v1_2_5"/>
+        <edmx:Include Namespace="EventDestination.v1_2_6"/>
         <edmx:Include Namespace="EventDestination.v1_3_0"/>
         <edmx:Include Namespace="EventDestination.v1_3_1"/>
         <edmx:Include Namespace="EventDestination.v1_3_2"/>
         <edmx:Include Namespace="EventDestination.v1_3_3"/>
+        <edmx:Include Namespace="EventDestination.v1_3_4"/>
         <edmx:Include Namespace="EventDestination.v1_4_0"/>
         <edmx:Include Namespace="EventDestination.v1_4_1"/>
         <edmx:Include Namespace="EventDestination.v1_4_2"/>
+        <edmx:Include Namespace="EventDestination.v1_4_3"/>
         <edmx:Include Namespace="EventDestination.v1_5_0"/>
         <edmx:Include Namespace="EventDestination.v1_5_1"/>
+        <edmx:Include Namespace="EventDestination.v1_5_2"/>
         <edmx:Include Namespace="EventDestination.v1_6_0"/>
         <edmx:Include Namespace="EventDestination.v1_6_1"/>
+        <edmx:Include Namespace="EventDestination.v1_6_2"/>
         <edmx:Include Namespace="EventDestination.v1_7_0"/>
         <edmx:Include Namespace="EventDestination.v1_7_1"/>
+        <edmx:Include Namespace="EventDestination.v1_7_2"/>
         <edmx:Include Namespace="EventDestination.v1_8_0"/>
         <edmx:Include Namespace="EventDestination.v1_8_1"/>
+        <edmx:Include Namespace="EventDestination.v1_8_2"/>
         <edmx:Include Namespace="EventDestination.v1_9_0"/>
+        <edmx:Include Namespace="EventDestination.v1_9_1"/>
+        <edmx:Include Namespace="EventDestination.v1_10_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/EventDestinationCollection_v1.xml">
         <edmx:Include Namespace="EventDestinationCollection"/>
@@ -778,30 +874,38 @@
         <edmx:Include Namespace="EventService.v1_0_10"/>
         <edmx:Include Namespace="EventService.v1_0_11"/>
         <edmx:Include Namespace="EventService.v1_0_12"/>
+        <edmx:Include Namespace="EventService.v1_0_13"/>
         <edmx:Include Namespace="EventService.v1_1_0"/>
         <edmx:Include Namespace="EventService.v1_1_1"/>
         <edmx:Include Namespace="EventService.v1_1_2"/>
         <edmx:Include Namespace="EventService.v1_1_3"/>
         <edmx:Include Namespace="EventService.v1_1_4"/>
         <edmx:Include Namespace="EventService.v1_1_5"/>
+        <edmx:Include Namespace="EventService.v1_1_6"/>
         <edmx:Include Namespace="EventService.v1_2_0"/>
         <edmx:Include Namespace="EventService.v1_2_1"/>
         <edmx:Include Namespace="EventService.v1_2_2"/>
         <edmx:Include Namespace="EventService.v1_2_3"/>
         <edmx:Include Namespace="EventService.v1_2_4"/>
+        <edmx:Include Namespace="EventService.v1_2_5"/>
         <edmx:Include Namespace="EventService.v1_3_0"/>
         <edmx:Include Namespace="EventService.v1_3_1"/>
         <edmx:Include Namespace="EventService.v1_3_2"/>
         <edmx:Include Namespace="EventService.v1_3_3"/>
+        <edmx:Include Namespace="EventService.v1_3_4"/>
         <edmx:Include Namespace="EventService.v1_4_0"/>
         <edmx:Include Namespace="EventService.v1_4_1"/>
         <edmx:Include Namespace="EventService.v1_4_2"/>
+        <edmx:Include Namespace="EventService.v1_4_3"/>
         <edmx:Include Namespace="EventService.v1_5_0"/>
         <edmx:Include Namespace="EventService.v1_5_1"/>
         <edmx:Include Namespace="EventService.v1_5_2"/>
+        <edmx:Include Namespace="EventService.v1_5_3"/>
         <edmx:Include Namespace="EventService.v1_6_0"/>
         <edmx:Include Namespace="EventService.v1_6_1"/>
+        <edmx:Include Namespace="EventService.v1_6_2"/>
         <edmx:Include Namespace="EventService.v1_7_0"/>
+        <edmx:Include Namespace="EventService.v1_7_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ExternalAccountProvider_v1.xml">
         <edmx:Include Namespace="ExternalAccountProvider"/>
@@ -810,10 +914,13 @@
         <edmx:Include Namespace="ExternalAccountProvider.v1_0_2"/>
         <edmx:Include Namespace="ExternalAccountProvider.v1_0_3"/>
         <edmx:Include Namespace="ExternalAccountProvider.v1_0_4"/>
+        <edmx:Include Namespace="ExternalAccountProvider.v1_0_5"/>
         <edmx:Include Namespace="ExternalAccountProvider.v1_1_0"/>
         <edmx:Include Namespace="ExternalAccountProvider.v1_1_1"/>
         <edmx:Include Namespace="ExternalAccountProvider.v1_1_2"/>
         <edmx:Include Namespace="ExternalAccountProvider.v1_1_3"/>
+        <edmx:Include Namespace="ExternalAccountProvider.v1_1_4"/>
+        <edmx:Include Namespace="ExternalAccountProvider.v1_2_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ExternalAccountProviderCollection_v1.xml">
         <edmx:Include Namespace="ExternalAccountProviderCollection"/>
@@ -828,9 +935,12 @@
         <edmx:Include Namespace="Fabric.v1_0_5"/>
         <edmx:Include Namespace="Fabric.v1_0_6"/>
         <edmx:Include Namespace="Fabric.v1_0_7"/>
+        <edmx:Include Namespace="Fabric.v1_0_8"/>
         <edmx:Include Namespace="Fabric.v1_1_0"/>
         <edmx:Include Namespace="Fabric.v1_1_1"/>
+        <edmx:Include Namespace="Fabric.v1_1_2"/>
         <edmx:Include Namespace="Fabric.v1_2_0"/>
+        <edmx:Include Namespace="Fabric.v1_2_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/FabricAdapter_v1.xml">
         <edmx:Include Namespace="FabricAdapter"/>
@@ -846,10 +956,18 @@
         <edmx:Include Namespace="Facility"/>
         <edmx:Include Namespace="Facility.v1_0_0"/>
         <edmx:Include Namespace="Facility.v1_0_1"/>
+        <edmx:Include Namespace="Facility.v1_1_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/FacilityCollection_v1.xml">
         <edmx:Include Namespace="FacilityCollection"/>
     </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/Fan_v1.xml">
+        <edmx:Include Namespace="Fan"/>
+        <edmx:Include Namespace="Fan.v1_0_0"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/FanCollection_v1.xml">
+        <edmx:Include Namespace="FanCollection"/>
+    </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/HostInterface_v1.xml">
         <edmx:Include Namespace="HostInterface"/>
         <edmx:Include Namespace="HostInterface.v1_0_0"/>
@@ -897,6 +1015,7 @@
         <edmx:Include Namespace="Job.v1_0_3"/>
         <edmx:Include Namespace="Job.v1_0_4"/>
         <edmx:Include Namespace="Job.v1_0_5"/>
+        <edmx:Include Namespace="Job.v1_0_6"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/JobCollection_v1.xml">
         <edmx:Include Namespace="JobCollection"/>
@@ -907,6 +1026,7 @@
         <edmx:Include Namespace="JobService.v1_0_1"/>
         <edmx:Include Namespace="JobService.v1_0_2"/>
         <edmx:Include Namespace="JobService.v1_0_3"/>
+        <edmx:Include Namespace="JobService.v1_0_4"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/JsonSchemaFile_v1.xml">
         <edmx:Include Namespace="JsonSchemaFile"/>
@@ -942,6 +1062,7 @@
         <edmx:Include Namespace="LogEntry.v1_0_11"/>
         <edmx:Include Namespace="LogEntry.v1_0_12"/>
         <edmx:Include Namespace="LogEntry.v1_0_13"/>
+        <edmx:Include Namespace="LogEntry.v1_0_14"/>
         <edmx:Include Namespace="LogEntry.v1_1_0"/>
         <edmx:Include Namespace="LogEntry.v1_1_1"/>
         <edmx:Include Namespace="LogEntry.v1_1_2"/>
@@ -954,6 +1075,7 @@
         <edmx:Include Namespace="LogEntry.v1_1_9"/>
         <edmx:Include Namespace="LogEntry.v1_1_10"/>
         <edmx:Include Namespace="LogEntry.v1_1_11"/>
+        <edmx:Include Namespace="LogEntry.v1_1_12"/>
         <edmx:Include Namespace="LogEntry.v1_2_0"/>
         <edmx:Include Namespace="LogEntry.v1_2_1"/>
         <edmx:Include Namespace="LogEntry.v1_2_2"/>
@@ -964,6 +1086,7 @@
         <edmx:Include Namespace="LogEntry.v1_2_7"/>
         <edmx:Include Namespace="LogEntry.v1_2_8"/>
         <edmx:Include Namespace="LogEntry.v1_2_9"/>
+        <edmx:Include Namespace="LogEntry.v1_2_10"/>
         <edmx:Include Namespace="LogEntry.v1_3_0"/>
         <edmx:Include Namespace="LogEntry.v1_3_1"/>
         <edmx:Include Namespace="LogEntry.v1_3_2"/>
@@ -973,6 +1096,7 @@
         <edmx:Include Namespace="LogEntry.v1_3_6"/>
         <edmx:Include Namespace="LogEntry.v1_3_7"/>
         <edmx:Include Namespace="LogEntry.v1_3_8"/>
+        <edmx:Include Namespace="LogEntry.v1_3_9"/>
         <edmx:Include Namespace="LogEntry.v1_4_0"/>
         <edmx:Include Namespace="LogEntry.v1_4_1"/>
         <edmx:Include Namespace="LogEntry.v1_4_2"/>
@@ -981,14 +1105,19 @@
         <edmx:Include Namespace="LogEntry.v1_4_5"/>
         <edmx:Include Namespace="LogEntry.v1_4_6"/>
         <edmx:Include Namespace="LogEntry.v1_4_7"/>
+        <edmx:Include Namespace="LogEntry.v1_4_8"/>
         <edmx:Include Namespace="LogEntry.v1_5_0"/>
         <edmx:Include Namespace="LogEntry.v1_5_1"/>
         <edmx:Include Namespace="LogEntry.v1_5_2"/>
         <edmx:Include Namespace="LogEntry.v1_5_3"/>
+        <edmx:Include Namespace="LogEntry.v1_5_4"/>
         <edmx:Include Namespace="LogEntry.v1_6_0"/>
         <edmx:Include Namespace="LogEntry.v1_6_1"/>
         <edmx:Include Namespace="LogEntry.v1_6_2"/>
+        <edmx:Include Namespace="LogEntry.v1_6_3"/>
         <edmx:Include Namespace="LogEntry.v1_7_0"/>
+        <edmx:Include Namespace="LogEntry.v1_7_1"/>
+        <edmx:Include Namespace="LogEntry.v1_8_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/LogEntryCollection_v1.xml">
         <edmx:Include Namespace="LogEntryCollection"/>
@@ -1028,6 +1157,7 @@
         <edmx:Include Namespace="Manager.v1_0_11"/>
         <edmx:Include Namespace="Manager.v1_0_12"/>
         <edmx:Include Namespace="Manager.v1_0_13"/>
+        <edmx:Include Namespace="Manager.v1_0_14"/>
         <edmx:Include Namespace="Manager.v1_1_0"/>
         <edmx:Include Namespace="Manager.v1_1_1"/>
         <edmx:Include Namespace="Manager.v1_1_2"/>
@@ -1040,6 +1170,7 @@
         <edmx:Include Namespace="Manager.v1_1_9"/>
         <edmx:Include Namespace="Manager.v1_1_10"/>
         <edmx:Include Namespace="Manager.v1_1_11"/>
+        <edmx:Include Namespace="Manager.v1_1_12"/>
         <edmx:Include Namespace="Manager.v1_2_0"/>
         <edmx:Include Namespace="Manager.v1_2_1"/>
         <edmx:Include Namespace="Manager.v1_2_2"/>
@@ -1052,6 +1183,7 @@
         <edmx:Include Namespace="Manager.v1_2_9"/>
         <edmx:Include Namespace="Manager.v1_2_10"/>
         <edmx:Include Namespace="Manager.v1_2_11"/>
+        <edmx:Include Namespace="Manager.v1_2_12"/>
         <edmx:Include Namespace="Manager.v1_3_0"/>
         <edmx:Include Namespace="Manager.v1_3_1"/>
         <edmx:Include Namespace="Manager.v1_3_2"/>
@@ -1063,6 +1195,7 @@
         <edmx:Include Namespace="Manager.v1_3_8"/>
         <edmx:Include Namespace="Manager.v1_3_9"/>
         <edmx:Include Namespace="Manager.v1_3_10"/>
+        <edmx:Include Namespace="Manager.v1_3_11"/>
         <edmx:Include Namespace="Manager.v1_4_0"/>
         <edmx:Include Namespace="Manager.v1_4_1"/>
         <edmx:Include Namespace="Manager.v1_4_2"/>
@@ -1071,6 +1204,7 @@
         <edmx:Include Namespace="Manager.v1_4_5"/>
         <edmx:Include Namespace="Manager.v1_4_6"/>
         <edmx:Include Namespace="Manager.v1_4_7"/>
+        <edmx:Include Namespace="Manager.v1_4_8"/>
         <edmx:Include Namespace="Manager.v1_5_0"/>
         <edmx:Include Namespace="Manager.v1_5_1"/>
         <edmx:Include Namespace="Manager.v1_5_2"/>
@@ -1078,20 +1212,27 @@
         <edmx:Include Namespace="Manager.v1_5_4"/>
         <edmx:Include Namespace="Manager.v1_5_5"/>
         <edmx:Include Namespace="Manager.v1_5_6"/>
+        <edmx:Include Namespace="Manager.v1_5_7"/>
         <edmx:Include Namespace="Manager.v1_6_0"/>
         <edmx:Include Namespace="Manager.v1_6_1"/>
         <edmx:Include Namespace="Manager.v1_6_2"/>
         <edmx:Include Namespace="Manager.v1_6_3"/>
+        <edmx:Include Namespace="Manager.v1_6_4"/>
         <edmx:Include Namespace="Manager.v1_7_0"/>
         <edmx:Include Namespace="Manager.v1_7_1"/>
         <edmx:Include Namespace="Manager.v1_7_2"/>
         <edmx:Include Namespace="Manager.v1_7_3"/>
+        <edmx:Include Namespace="Manager.v1_7_4"/>
         <edmx:Include Namespace="Manager.v1_8_0"/>
         <edmx:Include Namespace="Manager.v1_8_1"/>
         <edmx:Include Namespace="Manager.v1_8_2"/>
+        <edmx:Include Namespace="Manager.v1_8_3"/>
         <edmx:Include Namespace="Manager.v1_9_0"/>
         <edmx:Include Namespace="Manager.v1_9_1"/>
+        <edmx:Include Namespace="Manager.v1_9_2"/>
         <edmx:Include Namespace="Manager.v1_10_0"/>
+        <edmx:Include Namespace="Manager.v1_10_1"/>
+        <edmx:Include Namespace="Manager.v1_11_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ManagerAccount_v1.xml">
         <edmx:Include Namespace="ManagerAccount"/>
@@ -1135,6 +1276,7 @@
         <edmx:Include Namespace="ManagerAccount.v1_6_0"/>
         <edmx:Include Namespace="ManagerAccount.v1_6_1"/>
         <edmx:Include Namespace="ManagerAccount.v1_6_2"/>
+        <edmx:Include Namespace="ManagerAccount.v1_7_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ManagerAccountCollection_v1.xml">
         <edmx:Include Namespace="ManagerAccountCollection"/>
@@ -1152,30 +1294,38 @@
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_0_6"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_0_7"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_0_8"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_0_9"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_1_0"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_1_1"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_1_2"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_1_3"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_1_4"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_1_5"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_1_6"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_2_0"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_2_1"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_2_2"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_2_3"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_2_4"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_2_5"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_3_0"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_3_1"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_3_2"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_3_3"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_3_4"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_4_0"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_4_1"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_4_2"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_4_3"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_4_4"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_5_0"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_5_1"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_5_2"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_5_3"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_6_0"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_6_1"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_6_2"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_7_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MediaController_v1.xml">
         <edmx:Include Namespace="MediaController"/>
@@ -1199,6 +1349,7 @@
         <edmx:Include Namespace="Memory.v1_0_8"/>
         <edmx:Include Namespace="Memory.v1_0_9"/>
         <edmx:Include Namespace="Memory.v1_0_10"/>
+        <edmx:Include Namespace="Memory.v1_0_11"/>
         <edmx:Include Namespace="Memory.v1_1_0"/>
         <edmx:Include Namespace="Memory.v1_1_1"/>
         <edmx:Include Namespace="Memory.v1_1_2"/>
@@ -1209,6 +1360,7 @@
         <edmx:Include Namespace="Memory.v1_1_7"/>
         <edmx:Include Namespace="Memory.v1_1_8"/>
         <edmx:Include Namespace="Memory.v1_1_9"/>
+        <edmx:Include Namespace="Memory.v1_1_10"/>
         <edmx:Include Namespace="Memory.v1_2_0"/>
         <edmx:Include Namespace="Memory.v1_2_1"/>
         <edmx:Include Namespace="Memory.v1_2_2"/>
@@ -1218,6 +1370,7 @@
         <edmx:Include Namespace="Memory.v1_2_6"/>
         <edmx:Include Namespace="Memory.v1_2_7"/>
         <edmx:Include Namespace="Memory.v1_2_8"/>
+        <edmx:Include Namespace="Memory.v1_2_9"/>
         <edmx:Include Namespace="Memory.v1_3_0"/>
         <edmx:Include Namespace="Memory.v1_3_1"/>
         <edmx:Include Namespace="Memory.v1_3_2"/>
@@ -1227,6 +1380,7 @@
         <edmx:Include Namespace="Memory.v1_3_6"/>
         <edmx:Include Namespace="Memory.v1_3_7"/>
         <edmx:Include Namespace="Memory.v1_3_8"/>
+        <edmx:Include Namespace="Memory.v1_3_9"/>
         <edmx:Include Namespace="Memory.v1_4_0"/>
         <edmx:Include Namespace="Memory.v1_4_1"/>
         <edmx:Include Namespace="Memory.v1_4_2"/>
@@ -1236,6 +1390,7 @@
         <edmx:Include Namespace="Memory.v1_4_6"/>
         <edmx:Include Namespace="Memory.v1_4_7"/>
         <edmx:Include Namespace="Memory.v1_4_8"/>
+        <edmx:Include Namespace="Memory.v1_4_9"/>
         <edmx:Include Namespace="Memory.v1_5_0"/>
         <edmx:Include Namespace="Memory.v1_5_1"/>
         <edmx:Include Namespace="Memory.v1_5_2"/>
@@ -1244,6 +1399,7 @@
         <edmx:Include Namespace="Memory.v1_5_5"/>
         <edmx:Include Namespace="Memory.v1_5_6"/>
         <edmx:Include Namespace="Memory.v1_5_7"/>
+        <edmx:Include Namespace="Memory.v1_5_8"/>
         <edmx:Include Namespace="Memory.v1_6_0"/>
         <edmx:Include Namespace="Memory.v1_6_1"/>
         <edmx:Include Namespace="Memory.v1_6_2"/>
@@ -1251,21 +1407,27 @@
         <edmx:Include Namespace="Memory.v1_6_4"/>
         <edmx:Include Namespace="Memory.v1_6_5"/>
         <edmx:Include Namespace="Memory.v1_6_6"/>
+        <edmx:Include Namespace="Memory.v1_6_7"/>
         <edmx:Include Namespace="Memory.v1_7_0"/>
         <edmx:Include Namespace="Memory.v1_7_1"/>
         <edmx:Include Namespace="Memory.v1_7_2"/>
         <edmx:Include Namespace="Memory.v1_7_3"/>
         <edmx:Include Namespace="Memory.v1_7_4"/>
         <edmx:Include Namespace="Memory.v1_7_5"/>
+        <edmx:Include Namespace="Memory.v1_7_6"/>
         <edmx:Include Namespace="Memory.v1_8_0"/>
         <edmx:Include Namespace="Memory.v1_8_1"/>
         <edmx:Include Namespace="Memory.v1_8_2"/>
         <edmx:Include Namespace="Memory.v1_8_3"/>
+        <edmx:Include Namespace="Memory.v1_8_4"/>
         <edmx:Include Namespace="Memory.v1_9_0"/>
         <edmx:Include Namespace="Memory.v1_9_1"/>
         <edmx:Include Namespace="Memory.v1_9_2"/>
         <edmx:Include Namespace="Memory.v1_9_3"/>
+        <edmx:Include Namespace="Memory.v1_9_4"/>
         <edmx:Include Namespace="Memory.v1_10_0"/>
+        <edmx:Include Namespace="Memory.v1_10_1"/>
+        <edmx:Include Namespace="Memory.v1_11_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MemoryChunks_v1.xml">
         <edmx:Include Namespace="MemoryChunks"/>
@@ -1276,20 +1438,25 @@
         <edmx:Include Namespace="MemoryChunks.v1_0_4"/>
         <edmx:Include Namespace="MemoryChunks.v1_0_5"/>
         <edmx:Include Namespace="MemoryChunks.v1_0_6"/>
+        <edmx:Include Namespace="MemoryChunks.v1_0_7"/>
         <edmx:Include Namespace="MemoryChunks.v1_1_0"/>
         <edmx:Include Namespace="MemoryChunks.v1_1_1"/>
         <edmx:Include Namespace="MemoryChunks.v1_1_2"/>
         <edmx:Include Namespace="MemoryChunks.v1_1_3"/>
         <edmx:Include Namespace="MemoryChunks.v1_1_4"/>
+        <edmx:Include Namespace="MemoryChunks.v1_1_5"/>
         <edmx:Include Namespace="MemoryChunks.v1_2_0"/>
         <edmx:Include Namespace="MemoryChunks.v1_2_1"/>
         <edmx:Include Namespace="MemoryChunks.v1_2_2"/>
         <edmx:Include Namespace="MemoryChunks.v1_2_3"/>
         <edmx:Include Namespace="MemoryChunks.v1_2_4"/>
         <edmx:Include Namespace="MemoryChunks.v1_2_5"/>
+        <edmx:Include Namespace="MemoryChunks.v1_2_6"/>
         <edmx:Include Namespace="MemoryChunks.v1_3_0"/>
         <edmx:Include Namespace="MemoryChunks.v1_3_1"/>
+        <edmx:Include Namespace="MemoryChunks.v1_3_2"/>
         <edmx:Include Namespace="MemoryChunks.v1_4_0"/>
+        <edmx:Include Namespace="MemoryChunks.v1_4_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MemoryChunksCollection_v1.xml">
         <edmx:Include Namespace="MemoryChunksCollection"/>
@@ -1329,6 +1496,7 @@
         <edmx:Include Namespace="MemoryMetrics.v1_0_5"/>
         <edmx:Include Namespace="MemoryMetrics.v1_0_6"/>
         <edmx:Include Namespace="MemoryMetrics.v1_0_7"/>
+        <edmx:Include Namespace="MemoryMetrics.v1_0_8"/>
         <edmx:Include Namespace="MemoryMetrics.v1_1_0"/>
         <edmx:Include Namespace="MemoryMetrics.v1_1_1"/>
         <edmx:Include Namespace="MemoryMetrics.v1_1_2"/>
@@ -1337,10 +1505,14 @@
         <edmx:Include Namespace="MemoryMetrics.v1_1_5"/>
         <edmx:Include Namespace="MemoryMetrics.v1_1_6"/>
         <edmx:Include Namespace="MemoryMetrics.v1_1_7"/>
+        <edmx:Include Namespace="MemoryMetrics.v1_1_8"/>
         <edmx:Include Namespace="MemoryMetrics.v1_2_0"/>
         <edmx:Include Namespace="MemoryMetrics.v1_2_1"/>
+        <edmx:Include Namespace="MemoryMetrics.v1_2_2"/>
         <edmx:Include Namespace="MemoryMetrics.v1_3_0"/>
+        <edmx:Include Namespace="MemoryMetrics.v1_3_1"/>
         <edmx:Include Namespace="MemoryMetrics.v1_4_0"/>
+        <edmx:Include Namespace="MemoryMetrics.v1_4_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Message_v1.xml">
         <edmx:Include Namespace="Message"/>
@@ -1353,8 +1525,10 @@
         <edmx:Include Namespace="Message.v1_0_7"/>
         <edmx:Include Namespace="Message.v1_0_8"/>
         <edmx:Include Namespace="Message.v1_0_9"/>
+        <edmx:Include Namespace="Message.v1_0_10"/>
         <edmx:Include Namespace="Message.v1_1_0"/>
         <edmx:Include Namespace="Message.v1_1_1"/>
+        <edmx:Include Namespace="Message.v1_1_2"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MessageRegistry_v1.xml">
         <edmx:Include Namespace="MessageRegistry"/>
@@ -1367,21 +1541,26 @@
         <edmx:Include Namespace="MessageRegistry.v1_0_7"/>
         <edmx:Include Namespace="MessageRegistry.v1_0_8"/>
         <edmx:Include Namespace="MessageRegistry.v1_0_9"/>
+        <edmx:Include Namespace="MessageRegistry.v1_0_10"/>
         <edmx:Include Namespace="MessageRegistry.v1_1_0"/>
         <edmx:Include Namespace="MessageRegistry.v1_1_1"/>
         <edmx:Include Namespace="MessageRegistry.v1_1_2"/>
         <edmx:Include Namespace="MessageRegistry.v1_1_3"/>
         <edmx:Include Namespace="MessageRegistry.v1_1_4"/>
         <edmx:Include Namespace="MessageRegistry.v1_1_5"/>
+        <edmx:Include Namespace="MessageRegistry.v1_1_6"/>
         <edmx:Include Namespace="MessageRegistry.v1_2_0"/>
         <edmx:Include Namespace="MessageRegistry.v1_2_1"/>
         <edmx:Include Namespace="MessageRegistry.v1_2_2"/>
         <edmx:Include Namespace="MessageRegistry.v1_2_3"/>
+        <edmx:Include Namespace="MessageRegistry.v1_2_4"/>
         <edmx:Include Namespace="MessageRegistry.v1_3_0"/>
         <edmx:Include Namespace="MessageRegistry.v1_3_1"/>
         <edmx:Include Namespace="MessageRegistry.v1_3_2"/>
+        <edmx:Include Namespace="MessageRegistry.v1_3_3"/>
         <edmx:Include Namespace="MessageRegistry.v1_4_0"/>
         <edmx:Include Namespace="MessageRegistry.v1_4_1"/>
+        <edmx:Include Namespace="MessageRegistry.v1_4_2"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MessageRegistryCollection_v1.xml">
         <edmx:Include Namespace="MessageRegistryCollection"/>
@@ -1411,7 +1590,9 @@
         <edmx:Include Namespace="MetricDefinition.v1_0_3"/>
         <edmx:Include Namespace="MetricDefinition.v1_0_4"/>
         <edmx:Include Namespace="MetricDefinition.v1_0_5"/>
+        <edmx:Include Namespace="MetricDefinition.v1_0_6"/>
         <edmx:Include Namespace="MetricDefinition.v1_1_0"/>
+        <edmx:Include Namespace="MetricDefinition.v1_1_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MetricDefinitionCollection_v1.xml">
         <edmx:Include Namespace="MetricDefinitionCollection"/>
@@ -1424,17 +1605,22 @@
         <edmx:Include Namespace="MetricReport.v1_0_3"/>
         <edmx:Include Namespace="MetricReport.v1_0_4"/>
         <edmx:Include Namespace="MetricReport.v1_0_5"/>
+        <edmx:Include Namespace="MetricReport.v1_0_6"/>
         <edmx:Include Namespace="MetricReport.v1_1_0"/>
         <edmx:Include Namespace="MetricReport.v1_1_1"/>
         <edmx:Include Namespace="MetricReport.v1_1_2"/>
         <edmx:Include Namespace="MetricReport.v1_1_3"/>
         <edmx:Include Namespace="MetricReport.v1_1_4"/>
+        <edmx:Include Namespace="MetricReport.v1_1_5"/>
         <edmx:Include Namespace="MetricReport.v1_2_0"/>
         <edmx:Include Namespace="MetricReport.v1_2_1"/>
         <edmx:Include Namespace="MetricReport.v1_2_2"/>
+        <edmx:Include Namespace="MetricReport.v1_2_3"/>
         <edmx:Include Namespace="MetricReport.v1_3_0"/>
         <edmx:Include Namespace="MetricReport.v1_3_1"/>
+        <edmx:Include Namespace="MetricReport.v1_3_2"/>
         <edmx:Include Namespace="MetricReport.v1_4_0"/>
+        <edmx:Include Namespace="MetricReport.v1_4_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MetricReportCollection_v1.xml">
         <edmx:Include Namespace="MetricReportCollection"/>
@@ -1448,21 +1634,26 @@
         <edmx:Include Namespace="MetricReportDefinition.v1_0_4"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_0_5"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_0_6"/>
+        <edmx:Include Namespace="MetricReportDefinition.v1_0_7"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_1_0"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_1_1"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_1_2"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_1_3"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_1_4"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_1_5"/>
+        <edmx:Include Namespace="MetricReportDefinition.v1_1_6"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_2_0"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_2_1"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_2_2"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_2_3"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_2_4"/>
+        <edmx:Include Namespace="MetricReportDefinition.v1_2_5"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_3_0"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_3_1"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_3_2"/>
         <edmx:Include Namespace="MetricReportDefinition.v1_3_3"/>
+        <edmx:Include Namespace="MetricReportDefinition.v1_3_4"/>
+        <edmx:Include Namespace="MetricReportDefinition.v1_4_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MetricReportDefinitionCollection_v1.xml">
         <edmx:Include Namespace="MetricReportDefinitionCollection"/>
@@ -1476,23 +1667,30 @@
         <edmx:Include Namespace="NetworkAdapter.v1_0_4"/>
         <edmx:Include Namespace="NetworkAdapter.v1_0_5"/>
         <edmx:Include Namespace="NetworkAdapter.v1_0_6"/>
+        <edmx:Include Namespace="NetworkAdapter.v1_0_7"/>
         <edmx:Include Namespace="NetworkAdapter.v1_1_0"/>
         <edmx:Include Namespace="NetworkAdapter.v1_1_1"/>
         <edmx:Include Namespace="NetworkAdapter.v1_1_2"/>
         <edmx:Include Namespace="NetworkAdapter.v1_1_3"/>
         <edmx:Include Namespace="NetworkAdapter.v1_1_4"/>
         <edmx:Include Namespace="NetworkAdapter.v1_1_5"/>
+        <edmx:Include Namespace="NetworkAdapter.v1_1_6"/>
         <edmx:Include Namespace="NetworkAdapter.v1_2_0"/>
         <edmx:Include Namespace="NetworkAdapter.v1_2_1"/>
         <edmx:Include Namespace="NetworkAdapter.v1_2_2"/>
         <edmx:Include Namespace="NetworkAdapter.v1_2_3"/>
         <edmx:Include Namespace="NetworkAdapter.v1_2_4"/>
+        <edmx:Include Namespace="NetworkAdapter.v1_2_5"/>
         <edmx:Include Namespace="NetworkAdapter.v1_3_0"/>
         <edmx:Include Namespace="NetworkAdapter.v1_3_1"/>
         <edmx:Include Namespace="NetworkAdapter.v1_3_2"/>
         <edmx:Include Namespace="NetworkAdapter.v1_3_3"/>
+        <edmx:Include Namespace="NetworkAdapter.v1_3_4"/>
         <edmx:Include Namespace="NetworkAdapter.v1_4_0"/>
+        <edmx:Include Namespace="NetworkAdapter.v1_4_1"/>
         <edmx:Include Namespace="NetworkAdapter.v1_5_0"/>
+        <edmx:Include Namespace="NetworkAdapter.v1_5_1"/>
+        <edmx:Include Namespace="NetworkAdapter.v1_6_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/NetworkAdapterCollection_v1.xml">
         <edmx:Include Namespace="NetworkAdapterCollection"/>
@@ -1507,6 +1705,7 @@
         <edmx:Include Namespace="NetworkDeviceFunction.v1_0_5"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_0_6"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_0_7"/>
+        <edmx:Include Namespace="NetworkDeviceFunction.v1_0_8"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_1_0"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_1_1"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_1_2"/>
@@ -1514,6 +1713,7 @@
         <edmx:Include Namespace="NetworkDeviceFunction.v1_1_4"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_1_5"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_1_6"/>
+        <edmx:Include Namespace="NetworkDeviceFunction.v1_1_7"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_2_0"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_2_1"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_2_2"/>
@@ -1521,14 +1721,18 @@
         <edmx:Include Namespace="NetworkDeviceFunction.v1_2_4"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_2_5"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_2_6"/>
+        <edmx:Include Namespace="NetworkDeviceFunction.v1_2_7"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_3_0"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_3_1"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_3_2"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_3_3"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_3_4"/>
+        <edmx:Include Namespace="NetworkDeviceFunction.v1_3_5"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_4_0"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_4_1"/>
+        <edmx:Include Namespace="NetworkDeviceFunction.v1_4_2"/>
         <edmx:Include Namespace="NetworkDeviceFunction.v1_5_0"/>
+        <edmx:Include Namespace="NetworkDeviceFunction.v1_5_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/NetworkDeviceFunctionCollection_v1.xml">
         <edmx:Include Namespace="NetworkDeviceFunctionCollection"/>
@@ -1541,12 +1745,15 @@
         <edmx:Include Namespace="NetworkInterface.v1_0_3"/>
         <edmx:Include Namespace="NetworkInterface.v1_0_4"/>
         <edmx:Include Namespace="NetworkInterface.v1_0_5"/>
+        <edmx:Include Namespace="NetworkInterface.v1_0_6"/>
         <edmx:Include Namespace="NetworkInterface.v1_1_0"/>
         <edmx:Include Namespace="NetworkInterface.v1_1_1"/>
         <edmx:Include Namespace="NetworkInterface.v1_1_2"/>
         <edmx:Include Namespace="NetworkInterface.v1_1_3"/>
         <edmx:Include Namespace="NetworkInterface.v1_1_4"/>
+        <edmx:Include Namespace="NetworkInterface.v1_1_5"/>
         <edmx:Include Namespace="NetworkInterface.v1_2_0"/>
+        <edmx:Include Namespace="NetworkInterface.v1_2_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/NetworkInterfaceCollection_v1.xml">
         <edmx:Include Namespace="NetworkInterfaceCollection"/>
@@ -1561,6 +1768,7 @@
         <edmx:Include Namespace="NetworkPort.v1_0_5"/>
         <edmx:Include Namespace="NetworkPort.v1_0_6"/>
         <edmx:Include Namespace="NetworkPort.v1_0_7"/>
+        <edmx:Include Namespace="NetworkPort.v1_0_8"/>
         <edmx:Include Namespace="NetworkPort.v1_1_0"/>
         <edmx:Include Namespace="NetworkPort.v1_1_1"/>
         <edmx:Include Namespace="NetworkPort.v1_1_2"/>
@@ -1568,13 +1776,17 @@
         <edmx:Include Namespace="NetworkPort.v1_1_4"/>
         <edmx:Include Namespace="NetworkPort.v1_1_5"/>
         <edmx:Include Namespace="NetworkPort.v1_1_6"/>
+        <edmx:Include Namespace="NetworkPort.v1_1_7"/>
         <edmx:Include Namespace="NetworkPort.v1_2_0"/>
         <edmx:Include Namespace="NetworkPort.v1_2_1"/>
         <edmx:Include Namespace="NetworkPort.v1_2_2"/>
         <edmx:Include Namespace="NetworkPort.v1_2_3"/>
         <edmx:Include Namespace="NetworkPort.v1_2_4"/>
         <edmx:Include Namespace="NetworkPort.v1_2_5"/>
+        <edmx:Include Namespace="NetworkPort.v1_2_6"/>
         <edmx:Include Namespace="NetworkPort.v1_3_0"/>
+        <edmx:Include Namespace="NetworkPort.v1_3_1"/>
+        <edmx:Include Namespace="NetworkPort.v1_4_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/NetworkPortCollection_v1.xml">
         <edmx:Include Namespace="NetworkPortCollection"/>
@@ -1583,6 +1795,7 @@
         <edmx:Include Namespace="OperatingConfig"/>
         <edmx:Include Namespace="OperatingConfig.v1_0_0"/>
         <edmx:Include Namespace="OperatingConfig.v1_0_1"/>
+        <edmx:Include Namespace="OperatingConfig.v1_0_2"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/OperatingConfigCollection_v1.xml">
         <edmx:Include Namespace="OperatingConfigCollection"/>
@@ -1591,7 +1804,9 @@
         <edmx:Include Namespace="Outlet"/>
         <edmx:Include Namespace="Outlet.v1_0_0"/>
         <edmx:Include Namespace="Outlet.v1_0_1"/>
+        <edmx:Include Namespace="Outlet.v1_0_2"/>
         <edmx:Include Namespace="Outlet.v1_1_0"/>
+        <edmx:Include Namespace="Outlet.v1_1_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/OutletCollection_v1.xml">
         <edmx:Include Namespace="OutletCollection"/>
@@ -1625,6 +1840,7 @@
         <edmx:Include Namespace="PCIeDevice.v1_3_2"/>
         <edmx:Include Namespace="PCIeDevice.v1_4_0"/>
         <edmx:Include Namespace="PCIeDevice.v1_5_0"/>
+        <edmx:Include Namespace="PCIeDevice.v1_6_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/PCIeDeviceCollection_v1.xml">
         <edmx:Include Namespace="PCIeDeviceCollection"/>
@@ -1663,6 +1879,7 @@
         <edmx:Include Namespace="PCIeSlots.v1_2_0"/>
         <edmx:Include Namespace="PCIeSlots.v1_3_0"/>
         <edmx:Include Namespace="PCIeSlots.v1_4_0"/>
+        <edmx:Include Namespace="PCIeSlots.v1_4_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/PhysicalContext_v1.xml">
         <edmx:Include Namespace="PhysicalContext"/>
@@ -1677,15 +1894,19 @@
         <edmx:Include Namespace="Port.v1_0_5"/>
         <edmx:Include Namespace="Port.v1_0_6"/>
         <edmx:Include Namespace="Port.v1_0_7"/>
+        <edmx:Include Namespace="Port.v1_0_8"/>
         <edmx:Include Namespace="Port.v1_1_0"/>
         <edmx:Include Namespace="Port.v1_1_1"/>
         <edmx:Include Namespace="Port.v1_1_2"/>
         <edmx:Include Namespace="Port.v1_1_3"/>
         <edmx:Include Namespace="Port.v1_1_4"/>
+        <edmx:Include Namespace="Port.v1_1_5"/>
         <edmx:Include Namespace="Port.v1_2_0"/>
         <edmx:Include Namespace="Port.v1_2_1"/>
         <edmx:Include Namespace="Port.v1_2_2"/>
+        <edmx:Include Namespace="Port.v1_2_3"/>
         <edmx:Include Namespace="Port.v1_3_0"/>
+        <edmx:Include Namespace="Port.v1_3_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/PortCollection_v1.xml">
         <edmx:Include Namespace="PortCollection"/>
@@ -1693,6 +1914,7 @@
     <edmx:Reference Uri="/redfish/v1/schema/PortMetrics_v1.xml">
         <edmx:Include Namespace="PortMetrics"/>
         <edmx:Include Namespace="PortMetrics.v1_0_0"/>
+        <edmx:Include Namespace="PortMetrics.v1_0_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Power_v1.xml">
         <edmx:Include Namespace="Power"/>
@@ -1708,6 +1930,7 @@
         <edmx:Include Namespace="Power.v1_0_9"/>
         <edmx:Include Namespace="Power.v1_0_10"/>
         <edmx:Include Namespace="Power.v1_0_11"/>
+        <edmx:Include Namespace="Power.v1_0_12"/>
         <edmx:Include Namespace="Power.v1_1_0"/>
         <edmx:Include Namespace="Power.v1_1_1"/>
         <edmx:Include Namespace="Power.v1_1_2"/>
@@ -1718,6 +1941,7 @@
         <edmx:Include Namespace="Power.v1_1_7"/>
         <edmx:Include Namespace="Power.v1_1_8"/>
         <edmx:Include Namespace="Power.v1_1_9"/>
+        <edmx:Include Namespace="Power.v1_1_10"/>
         <edmx:Include Namespace="Power.v1_2_0"/>
         <edmx:Include Namespace="Power.v1_2_1"/>
         <edmx:Include Namespace="Power.v1_2_2"/>
@@ -1728,6 +1952,7 @@
         <edmx:Include Namespace="Power.v1_2_7"/>
         <edmx:Include Namespace="Power.v1_2_8"/>
         <edmx:Include Namespace="Power.v1_2_9"/>
+        <edmx:Include Namespace="Power.v1_2_10"/>
         <edmx:Include Namespace="Power.v1_3_0"/>
         <edmx:Include Namespace="Power.v1_3_1"/>
         <edmx:Include Namespace="Power.v1_3_2"/>
@@ -1736,6 +1961,7 @@
         <edmx:Include Namespace="Power.v1_3_5"/>
         <edmx:Include Namespace="Power.v1_3_6"/>
         <edmx:Include Namespace="Power.v1_3_7"/>
+        <edmx:Include Namespace="Power.v1_3_8"/>
         <edmx:Include Namespace="Power.v1_4_0"/>
         <edmx:Include Namespace="Power.v1_4_1"/>
         <edmx:Include Namespace="Power.v1_4_2"/>
@@ -1743,19 +1969,24 @@
         <edmx:Include Namespace="Power.v1_4_4"/>
         <edmx:Include Namespace="Power.v1_4_5"/>
         <edmx:Include Namespace="Power.v1_4_6"/>
+        <edmx:Include Namespace="Power.v1_4_7"/>
         <edmx:Include Namespace="Power.v1_5_0"/>
         <edmx:Include Namespace="Power.v1_5_1"/>
         <edmx:Include Namespace="Power.v1_5_2"/>
         <edmx:Include Namespace="Power.v1_5_3"/>
         <edmx:Include Namespace="Power.v1_5_4"/>
         <edmx:Include Namespace="Power.v1_5_5"/>
+        <edmx:Include Namespace="Power.v1_5_6"/>
         <edmx:Include Namespace="Power.v1_6_0"/>
         <edmx:Include Namespace="Power.v1_6_1"/>
+        <edmx:Include Namespace="Power.v1_6_2"/>
+        <edmx:Include Namespace="Power.v1_7_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/PowerDistribution_v1.xml">
         <edmx:Include Namespace="PowerDistribution"/>
         <edmx:Include Namespace="PowerDistribution.v1_0_0"/>
         <edmx:Include Namespace="PowerDistribution.v1_0_1"/>
+        <edmx:Include Namespace="PowerDistribution.v1_0_2"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/PowerDistributionCollection_v1.xml">
         <edmx:Include Namespace="PowerDistributionCollection"/>
@@ -1776,6 +2007,21 @@
         <edmx:Include Namespace="PowerEquipment"/>
         <edmx:Include Namespace="PowerEquipment.v1_0_0"/>
     </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/PowerSubsystem_v1.xml">
+        <edmx:Include Namespace="PowerSubsystem"/>
+        <edmx:Include Namespace="PowerSubsystem.v1_0_0"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/PowerSupply_v1.xml">
+        <edmx:Include Namespace="PowerSupply"/>
+        <edmx:Include Namespace="PowerSupply.v1_0_0"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/PowerSupplyCollection_v1.xml">
+        <edmx:Include Namespace="PowerSupplyCollection"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/PowerSupplyMetrics_v1.xml">
+        <edmx:Include Namespace="PowerSupplyMetrics"/>
+        <edmx:Include Namespace="PowerSupplyMetrics.v1_0_0"/>
+    </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/PrivilegeRegistry_v1.xml">
         <edmx:Include Namespace="PrivilegeRegistry"/>
         <edmx:Include Namespace="PrivilegeRegistry.v1_0_0"/>
@@ -1811,6 +2057,7 @@
         <edmx:Include Namespace="Processor.v1_0_9"/>
         <edmx:Include Namespace="Processor.v1_0_10"/>
         <edmx:Include Namespace="Processor.v1_0_11"/>
+        <edmx:Include Namespace="Processor.v1_0_12"/>
         <edmx:Include Namespace="Processor.v1_1_0"/>
         <edmx:Include Namespace="Processor.v1_1_1"/>
         <edmx:Include Namespace="Processor.v1_1_2"/>
@@ -1819,6 +2066,7 @@
         <edmx:Include Namespace="Processor.v1_1_5"/>
         <edmx:Include Namespace="Processor.v1_1_6"/>
         <edmx:Include Namespace="Processor.v1_1_7"/>
+        <edmx:Include Namespace="Processor.v1_1_8"/>
         <edmx:Include Namespace="Processor.v1_2_0"/>
         <edmx:Include Namespace="Processor.v1_2_1"/>
         <edmx:Include Namespace="Processor.v1_2_2"/>
@@ -1827,6 +2075,7 @@
         <edmx:Include Namespace="Processor.v1_2_5"/>
         <edmx:Include Namespace="Processor.v1_2_6"/>
         <edmx:Include Namespace="Processor.v1_2_7"/>
+        <edmx:Include Namespace="Processor.v1_2_8"/>
         <edmx:Include Namespace="Processor.v1_3_0"/>
         <edmx:Include Namespace="Processor.v1_3_1"/>
         <edmx:Include Namespace="Processor.v1_3_2"/>
@@ -1835,6 +2084,7 @@
         <edmx:Include Namespace="Processor.v1_3_5"/>
         <edmx:Include Namespace="Processor.v1_3_6"/>
         <edmx:Include Namespace="Processor.v1_3_7"/>
+        <edmx:Include Namespace="Processor.v1_3_8"/>
         <edmx:Include Namespace="Processor.v1_4_0"/>
         <edmx:Include Namespace="Processor.v1_4_1"/>
         <edmx:Include Namespace="Processor.v1_4_2"/>
@@ -1842,23 +2092,31 @@
         <edmx:Include Namespace="Processor.v1_4_4"/>
         <edmx:Include Namespace="Processor.v1_4_5"/>
         <edmx:Include Namespace="Processor.v1_4_6"/>
+        <edmx:Include Namespace="Processor.v1_4_7"/>
         <edmx:Include Namespace="Processor.v1_5_0"/>
         <edmx:Include Namespace="Processor.v1_5_1"/>
         <edmx:Include Namespace="Processor.v1_5_2"/>
         <edmx:Include Namespace="Processor.v1_5_3"/>
         <edmx:Include Namespace="Processor.v1_5_4"/>
         <edmx:Include Namespace="Processor.v1_5_5"/>
+        <edmx:Include Namespace="Processor.v1_5_6"/>
         <edmx:Include Namespace="Processor.v1_6_0"/>
         <edmx:Include Namespace="Processor.v1_6_1"/>
         <edmx:Include Namespace="Processor.v1_6_2"/>
         <edmx:Include Namespace="Processor.v1_6_3"/>
+        <edmx:Include Namespace="Processor.v1_6_4"/>
         <edmx:Include Namespace="Processor.v1_7_0"/>
         <edmx:Include Namespace="Processor.v1_7_1"/>
         <edmx:Include Namespace="Processor.v1_7_2"/>
+        <edmx:Include Namespace="Processor.v1_7_3"/>
         <edmx:Include Namespace="Processor.v1_8_0"/>
         <edmx:Include Namespace="Processor.v1_8_1"/>
+        <edmx:Include Namespace="Processor.v1_8_2"/>
         <edmx:Include Namespace="Processor.v1_9_0"/>
+        <edmx:Include Namespace="Processor.v1_9_1"/>
         <edmx:Include Namespace="Processor.v1_10_0"/>
+        <edmx:Include Namespace="Processor.v1_10_1"/>
+        <edmx:Include Namespace="Processor.v1_11_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ProcessorCollection_v1.xml">
         <edmx:Include Namespace="ProcessorCollection"/>
@@ -1869,8 +2127,11 @@
         <edmx:Include Namespace="ProcessorMetrics.v1_0_1"/>
         <edmx:Include Namespace="ProcessorMetrics.v1_0_2"/>
         <edmx:Include Namespace="ProcessorMetrics.v1_0_3"/>
+        <edmx:Include Namespace="ProcessorMetrics.v1_0_4"/>
         <edmx:Include Namespace="ProcessorMetrics.v1_1_0"/>
         <edmx:Include Namespace="ProcessorMetrics.v1_1_1"/>
+        <edmx:Include Namespace="ProcessorMetrics.v1_1_2"/>
+        <edmx:Include Namespace="ProcessorMetrics.v1_2_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Protocol_v1.xml">
         <edmx:Include Namespace="Protocol"/>
@@ -1895,6 +2156,7 @@
         <edmx:Include Namespace="Redundancy.v1_0_7"/>
         <edmx:Include Namespace="Redundancy.v1_0_8"/>
         <edmx:Include Namespace="Redundancy.v1_0_9"/>
+        <edmx:Include Namespace="Redundancy.v1_0_10"/>
         <edmx:Include Namespace="Redundancy.v1_1_0"/>
         <edmx:Include Namespace="Redundancy.v1_1_1"/>
         <edmx:Include Namespace="Redundancy.v1_1_2"/>
@@ -1903,18 +2165,22 @@
         <edmx:Include Namespace="Redundancy.v1_1_5"/>
         <edmx:Include Namespace="Redundancy.v1_1_6"/>
         <edmx:Include Namespace="Redundancy.v1_1_7"/>
+        <edmx:Include Namespace="Redundancy.v1_1_8"/>
         <edmx:Include Namespace="Redundancy.v1_2_0"/>
         <edmx:Include Namespace="Redundancy.v1_2_1"/>
         <edmx:Include Namespace="Redundancy.v1_2_2"/>
         <edmx:Include Namespace="Redundancy.v1_2_3"/>
         <edmx:Include Namespace="Redundancy.v1_2_4"/>
         <edmx:Include Namespace="Redundancy.v1_2_5"/>
+        <edmx:Include Namespace="Redundancy.v1_2_6"/>
         <edmx:Include Namespace="Redundancy.v1_3_0"/>
         <edmx:Include Namespace="Redundancy.v1_3_1"/>
         <edmx:Include Namespace="Redundancy.v1_3_2"/>
         <edmx:Include Namespace="Redundancy.v1_3_3"/>
         <edmx:Include Namespace="Redundancy.v1_3_4"/>
         <edmx:Include Namespace="Redundancy.v1_3_5"/>
+        <edmx:Include Namespace="Redundancy.v1_3_6"/>
+        <edmx:Include Namespace="Redundancy.v1_4_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Resource_v1.xml">
         <edmx:Include Namespace="Resource"/>
@@ -1928,6 +2194,7 @@
         <edmx:Include Namespace="Resource.v1_0_8"/>
         <edmx:Include Namespace="Resource.v1_0_9"/>
         <edmx:Include Namespace="Resource.v1_0_10"/>
+        <edmx:Include Namespace="Resource.v1_0_11"/>
         <edmx:Include Namespace="Resource.v1_1_0"/>
         <edmx:Include Namespace="Resource.v1_1_1"/>
         <edmx:Include Namespace="Resource.v1_1_2"/>
@@ -1940,6 +2207,7 @@
         <edmx:Include Namespace="Resource.v1_1_9"/>
         <edmx:Include Namespace="Resource.v1_1_10"/>
         <edmx:Include Namespace="Resource.v1_1_11"/>
+        <edmx:Include Namespace="Resource.v1_1_12"/>
         <edmx:Include Namespace="Resource.v1_2_0"/>
         <edmx:Include Namespace="Resource.v1_2_1"/>
         <edmx:Include Namespace="Resource.v1_2_2"/>
@@ -1951,6 +2219,7 @@
         <edmx:Include Namespace="Resource.v1_2_8"/>
         <edmx:Include Namespace="Resource.v1_2_9"/>
         <edmx:Include Namespace="Resource.v1_2_10"/>
+        <edmx:Include Namespace="Resource.v1_2_11"/>
         <edmx:Include Namespace="Resource.v1_3_0"/>
         <edmx:Include Namespace="Resource.v1_3_1"/>
         <edmx:Include Namespace="Resource.v1_3_2"/>
@@ -1961,6 +2230,7 @@
         <edmx:Include Namespace="Resource.v1_3_7"/>
         <edmx:Include Namespace="Resource.v1_3_8"/>
         <edmx:Include Namespace="Resource.v1_3_9"/>
+        <edmx:Include Namespace="Resource.v1_3_10"/>
         <edmx:Include Namespace="Resource.v1_4_0"/>
         <edmx:Include Namespace="Resource.v1_4_1"/>
         <edmx:Include Namespace="Resource.v1_4_2"/>
@@ -1970,6 +2240,7 @@
         <edmx:Include Namespace="Resource.v1_4_6"/>
         <edmx:Include Namespace="Resource.v1_4_7"/>
         <edmx:Include Namespace="Resource.v1_4_8"/>
+        <edmx:Include Namespace="Resource.v1_4_9"/>
         <edmx:Include Namespace="Resource.v1_5_0"/>
         <edmx:Include Namespace="Resource.v1_5_1"/>
         <edmx:Include Namespace="Resource.v1_5_2"/>
@@ -1978,6 +2249,7 @@
         <edmx:Include Namespace="Resource.v1_5_5"/>
         <edmx:Include Namespace="Resource.v1_5_6"/>
         <edmx:Include Namespace="Resource.v1_5_7"/>
+        <edmx:Include Namespace="Resource.v1_5_8"/>
         <edmx:Include Namespace="Resource.v1_6_0"/>
         <edmx:Include Namespace="Resource.v1_6_1"/>
         <edmx:Include Namespace="Resource.v1_6_2"/>
@@ -1985,23 +2257,29 @@
         <edmx:Include Namespace="Resource.v1_6_4"/>
         <edmx:Include Namespace="Resource.v1_6_5"/>
         <edmx:Include Namespace="Resource.v1_6_6"/>
+        <edmx:Include Namespace="Resource.v1_6_7"/>
         <edmx:Include Namespace="Resource.v1_7_0"/>
         <edmx:Include Namespace="Resource.v1_7_1"/>
         <edmx:Include Namespace="Resource.v1_7_2"/>
         <edmx:Include Namespace="Resource.v1_7_3"/>
         <edmx:Include Namespace="Resource.v1_7_4"/>
         <edmx:Include Namespace="Resource.v1_7_5"/>
+        <edmx:Include Namespace="Resource.v1_7_6"/>
         <edmx:Include Namespace="Resource.v1_8_0"/>
         <edmx:Include Namespace="Resource.v1_8_1"/>
         <edmx:Include Namespace="Resource.v1_8_2"/>
         <edmx:Include Namespace="Resource.v1_8_3"/>
         <edmx:Include Namespace="Resource.v1_8_4"/>
         <edmx:Include Namespace="Resource.v1_8_5"/>
+        <edmx:Include Namespace="Resource.v1_8_6"/>
         <edmx:Include Namespace="Resource.v1_9_0"/>
         <edmx:Include Namespace="Resource.v1_9_1"/>
         <edmx:Include Namespace="Resource.v1_9_2"/>
         <edmx:Include Namespace="Resource.v1_9_3"/>
+        <edmx:Include Namespace="Resource.v1_9_4"/>
         <edmx:Include Namespace="Resource.v1_10_0"/>
+        <edmx:Include Namespace="Resource.v1_10_1"/>
+        <edmx:Include Namespace="Resource.v1_11_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ResourceBlock_v1.xml">
         <edmx:Include Namespace="ResourceBlock"/>
@@ -2011,21 +2289,25 @@
         <edmx:Include Namespace="ResourceBlock.v1_0_3"/>
         <edmx:Include Namespace="ResourceBlock.v1_0_4"/>
         <edmx:Include Namespace="ResourceBlock.v1_0_5"/>
+        <edmx:Include Namespace="ResourceBlock.v1_0_6"/>
         <edmx:Include Namespace="ResourceBlock.v1_1_0"/>
         <edmx:Include Namespace="ResourceBlock.v1_1_1"/>
         <edmx:Include Namespace="ResourceBlock.v1_1_2"/>
         <edmx:Include Namespace="ResourceBlock.v1_1_3"/>
         <edmx:Include Namespace="ResourceBlock.v1_1_4"/>
         <edmx:Include Namespace="ResourceBlock.v1_1_5"/>
+        <edmx:Include Namespace="ResourceBlock.v1_1_6"/>
         <edmx:Include Namespace="ResourceBlock.v1_2_0"/>
         <edmx:Include Namespace="ResourceBlock.v1_2_1"/>
         <edmx:Include Namespace="ResourceBlock.v1_2_2"/>
         <edmx:Include Namespace="ResourceBlock.v1_2_3"/>
         <edmx:Include Namespace="ResourceBlock.v1_2_4"/>
+        <edmx:Include Namespace="ResourceBlock.v1_2_5"/>
         <edmx:Include Namespace="ResourceBlock.v1_3_0"/>
         <edmx:Include Namespace="ResourceBlock.v1_3_1"/>
         <edmx:Include Namespace="ResourceBlock.v1_3_2"/>
         <edmx:Include Namespace="ResourceBlock.v1_3_3"/>
+        <edmx:Include Namespace="ResourceBlock.v1_3_4"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ResourceBlockCollection_v1.xml">
         <edmx:Include Namespace="ResourceBlockCollection"/>
@@ -2051,6 +2333,7 @@
         <edmx:Include Namespace="Role.v1_2_3"/>
         <edmx:Include Namespace="Role.v1_2_4"/>
         <edmx:Include Namespace="Role.v1_2_5"/>
+        <edmx:Include Namespace="Role.v1_3_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/RoleCollection_v1.xml">
         <edmx:Include Namespace="RoleCollection"/>
@@ -2058,6 +2341,7 @@
     <edmx:Reference Uri="/redfish/v1/schema/RouteEntry_v1.xml">
         <edmx:Include Namespace="RouteEntry"/>
         <edmx:Include Namespace="RouteEntry.v1_0_0"/>
+        <edmx:Include Namespace="RouteEntry.v1_0_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/RouteEntryCollection_v1.xml">
         <edmx:Include Namespace="RouteEntryCollection"/>
@@ -2065,6 +2349,7 @@
     <edmx:Reference Uri="/redfish/v1/schema/RouteSetEntry_v1.xml">
         <edmx:Include Namespace="RouteSetEntry"/>
         <edmx:Include Namespace="RouteSetEntry.v1_0_0"/>
+        <edmx:Include Namespace="RouteSetEntry.v1_0_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/RouteSetEntryCollection_v1.xml">
         <edmx:Include Namespace="RouteSetEntryCollection"/>
@@ -2075,8 +2360,10 @@
         <edmx:Include Namespace="Schedule.v1_0_1"/>
         <edmx:Include Namespace="Schedule.v1_1_0"/>
         <edmx:Include Namespace="Schedule.v1_1_1"/>
+        <edmx:Include Namespace="Schedule.v1_1_2"/>
         <edmx:Include Namespace="Schedule.v1_2_0"/>
         <edmx:Include Namespace="Schedule.v1_2_1"/>
+        <edmx:Include Namespace="Schedule.v1_2_2"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/SecureBoot_v1.xml">
         <edmx:Include Namespace="SecureBoot"/>
@@ -2105,8 +2392,11 @@
         <edmx:Include Namespace="Sensor.v1_0_3"/>
         <edmx:Include Namespace="Sensor.v1_0_4"/>
         <edmx:Include Namespace="Sensor.v1_0_5"/>
+        <edmx:Include Namespace="Sensor.v1_0_6"/>
         <edmx:Include Namespace="Sensor.v1_1_0"/>
         <edmx:Include Namespace="Sensor.v1_1_1"/>
+        <edmx:Include Namespace="Sensor.v1_1_2"/>
+        <edmx:Include Namespace="Sensor.v1_2_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/SensorCollection_v1.xml">
         <edmx:Include Namespace="SensorCollection"/>
@@ -2205,6 +2495,7 @@
         <edmx:Include Namespace="SessionService.v1_0_6"/>
         <edmx:Include Namespace="SessionService.v1_0_7"/>
         <edmx:Include Namespace="SessionService.v1_0_8"/>
+        <edmx:Include Namespace="SessionService.v1_0_9"/>
         <edmx:Include Namespace="SessionService.v1_1_0"/>
         <edmx:Include Namespace="SessionService.v1_1_1"/>
         <edmx:Include Namespace="SessionService.v1_1_2"/>
@@ -2213,6 +2504,7 @@
         <edmx:Include Namespace="SessionService.v1_1_5"/>
         <edmx:Include Namespace="SessionService.v1_1_6"/>
         <edmx:Include Namespace="SessionService.v1_1_7"/>
+        <edmx:Include Namespace="SessionService.v1_1_8"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Settings_v1.xml">
         <edmx:Include Namespace="Settings"/>
@@ -2228,19 +2520,23 @@
         <edmx:Include Namespace="Settings.v1_1_2"/>
         <edmx:Include Namespace="Settings.v1_1_3"/>
         <edmx:Include Namespace="Settings.v1_1_4"/>
+        <edmx:Include Namespace="Settings.v1_1_5"/>
         <edmx:Include Namespace="Settings.v1_2_0"/>
         <edmx:Include Namespace="Settings.v1_2_1"/>
         <edmx:Include Namespace="Settings.v1_2_2"/>
         <edmx:Include Namespace="Settings.v1_2_3"/>
         <edmx:Include Namespace="Settings.v1_2_4"/>
+        <edmx:Include Namespace="Settings.v1_2_5"/>
         <edmx:Include Namespace="Settings.v1_3_0"/>
         <edmx:Include Namespace="Settings.v1_3_1"/>
         <edmx:Include Namespace="Settings.v1_3_2"/>
+        <edmx:Include Namespace="Settings.v1_3_3"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Signature_v1.xml">
         <edmx:Include Namespace="Signature"/>
         <edmx:Include Namespace="Signature.v1_0_0"/>
         <edmx:Include Namespace="Signature.v1_0_1"/>
+        <edmx:Include Namespace="Signature.v1_0_2"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/SignatureCollection_v1.xml">
         <edmx:Include Namespace="SignatureCollection"/>
@@ -2254,17 +2550,21 @@
         <edmx:Include Namespace="SimpleStorage.v1_0_5"/>
         <edmx:Include Namespace="SimpleStorage.v1_0_6"/>
         <edmx:Include Namespace="SimpleStorage.v1_0_7"/>
+        <edmx:Include Namespace="SimpleStorage.v1_0_8"/>
         <edmx:Include Namespace="SimpleStorage.v1_1_0"/>
         <edmx:Include Namespace="SimpleStorage.v1_1_1"/>
         <edmx:Include Namespace="SimpleStorage.v1_1_2"/>
         <edmx:Include Namespace="SimpleStorage.v1_1_3"/>
         <edmx:Include Namespace="SimpleStorage.v1_1_4"/>
         <edmx:Include Namespace="SimpleStorage.v1_1_5"/>
+        <edmx:Include Namespace="SimpleStorage.v1_1_6"/>
         <edmx:Include Namespace="SimpleStorage.v1_2_0"/>
         <edmx:Include Namespace="SimpleStorage.v1_2_1"/>
         <edmx:Include Namespace="SimpleStorage.v1_2_2"/>
         <edmx:Include Namespace="SimpleStorage.v1_2_3"/>
+        <edmx:Include Namespace="SimpleStorage.v1_2_4"/>
         <edmx:Include Namespace="SimpleStorage.v1_3_0"/>
+        <edmx:Include Namespace="SimpleStorage.v1_3_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/SimpleStorageCollection_v1.xml">
         <edmx:Include Namespace="SimpleStorageCollection"/>
@@ -2287,6 +2587,7 @@
         <edmx:Include Namespace="SoftwareInventory.v1_2_2"/>
         <edmx:Include Namespace="SoftwareInventory.v1_2_3"/>
         <edmx:Include Namespace="SoftwareInventory.v1_3_0"/>
+        <edmx:Include Namespace="SoftwareInventory.v1_4_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/SoftwareInventoryCollection_v1.xml">
         <edmx:Include Namespace="SoftwareInventoryCollection"/>
@@ -2303,6 +2604,7 @@
         <edmx:Include Namespace="Storage.v1_0_7"/>
         <edmx:Include Namespace="Storage.v1_0_8"/>
         <edmx:Include Namespace="Storage.v1_0_9"/>
+        <edmx:Include Namespace="Storage.v1_0_10"/>
         <edmx:Include Namespace="Storage.v1_1_0"/>
         <edmx:Include Namespace="Storage.v1_1_1"/>
         <edmx:Include Namespace="Storage.v1_1_2"/>
@@ -2312,6 +2614,7 @@
         <edmx:Include Namespace="Storage.v1_1_6"/>
         <edmx:Include Namespace="Storage.v1_1_7"/>
         <edmx:Include Namespace="Storage.v1_1_8"/>
+        <edmx:Include Namespace="Storage.v1_1_9"/>
         <edmx:Include Namespace="Storage.v1_2_0"/>
         <edmx:Include Namespace="Storage.v1_2_1"/>
         <edmx:Include Namespace="Storage.v1_2_2"/>
@@ -2319,6 +2622,7 @@
         <edmx:Include Namespace="Storage.v1_2_4"/>
         <edmx:Include Namespace="Storage.v1_2_5"/>
         <edmx:Include Namespace="Storage.v1_2_6"/>
+        <edmx:Include Namespace="Storage.v1_2_7"/>
         <edmx:Include Namespace="Storage.v1_3_0"/>
         <edmx:Include Namespace="Storage.v1_3_1"/>
         <edmx:Include Namespace="Storage.v1_3_2"/>
@@ -2326,27 +2630,35 @@
         <edmx:Include Namespace="Storage.v1_3_4"/>
         <edmx:Include Namespace="Storage.v1_3_5"/>
         <edmx:Include Namespace="Storage.v1_3_6"/>
+        <edmx:Include Namespace="Storage.v1_3_7"/>
         <edmx:Include Namespace="Storage.v1_4_0"/>
         <edmx:Include Namespace="Storage.v1_4_1"/>
         <edmx:Include Namespace="Storage.v1_4_2"/>
         <edmx:Include Namespace="Storage.v1_4_3"/>
         <edmx:Include Namespace="Storage.v1_4_4"/>
         <edmx:Include Namespace="Storage.v1_4_5"/>
+        <edmx:Include Namespace="Storage.v1_4_6"/>
         <edmx:Include Namespace="Storage.v1_5_0"/>
         <edmx:Include Namespace="Storage.v1_5_1"/>
         <edmx:Include Namespace="Storage.v1_5_2"/>
         <edmx:Include Namespace="Storage.v1_5_3"/>
         <edmx:Include Namespace="Storage.v1_5_4"/>
+        <edmx:Include Namespace="Storage.v1_5_5"/>
         <edmx:Include Namespace="Storage.v1_6_0"/>
         <edmx:Include Namespace="Storage.v1_6_1"/>
         <edmx:Include Namespace="Storage.v1_6_2"/>
         <edmx:Include Namespace="Storage.v1_6_3"/>
+        <edmx:Include Namespace="Storage.v1_6_4"/>
         <edmx:Include Namespace="Storage.v1_7_0"/>
         <edmx:Include Namespace="Storage.v1_7_1"/>
         <edmx:Include Namespace="Storage.v1_7_2"/>
+        <edmx:Include Namespace="Storage.v1_7_3"/>
         <edmx:Include Namespace="Storage.v1_8_0"/>
         <edmx:Include Namespace="Storage.v1_8_1"/>
+        <edmx:Include Namespace="Storage.v1_8_2"/>
         <edmx:Include Namespace="Storage.v1_9_0"/>
+        <edmx:Include Namespace="Storage.v1_9_1"/>
+        <edmx:Include Namespace="Storage.v1_10_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/StorageCollection_v1.xml">
         <edmx:Include Namespace="StorageCollection"/>
@@ -2354,6 +2666,8 @@
     <edmx:Reference Uri="/redfish/v1/schema/StorageController_v1.xml">
         <edmx:Include Namespace="StorageController"/>
         <edmx:Include Namespace="StorageController.v1_0_0"/>
+        <edmx:Include Namespace="StorageController.v1_0_1"/>
+        <edmx:Include Namespace="StorageController.v1_1_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/StorageControllerCollection_v1.xml">
         <edmx:Include Namespace="StorageControllerCollection"/>
@@ -2368,16 +2682,22 @@
         <edmx:Include Namespace="Switch.v1_0_5"/>
         <edmx:Include Namespace="Switch.v1_0_6"/>
         <edmx:Include Namespace="Switch.v1_0_7"/>
+        <edmx:Include Namespace="Switch.v1_0_8"/>
         <edmx:Include Namespace="Switch.v1_1_0"/>
         <edmx:Include Namespace="Switch.v1_1_1"/>
         <edmx:Include Namespace="Switch.v1_1_2"/>
         <edmx:Include Namespace="Switch.v1_1_3"/>
         <edmx:Include Namespace="Switch.v1_1_4"/>
+        <edmx:Include Namespace="Switch.v1_1_5"/>
         <edmx:Include Namespace="Switch.v1_2_0"/>
         <edmx:Include Namespace="Switch.v1_2_1"/>
+        <edmx:Include Namespace="Switch.v1_2_2"/>
         <edmx:Include Namespace="Switch.v1_3_0"/>
         <edmx:Include Namespace="Switch.v1_3_1"/>
+        <edmx:Include Namespace="Switch.v1_3_2"/>
         <edmx:Include Namespace="Switch.v1_4_0"/>
+        <edmx:Include Namespace="Switch.v1_4_1"/>
+        <edmx:Include Namespace="Switch.v1_5_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/SwitchCollection_v1.xml">
         <edmx:Include Namespace="SwitchCollection"/>
@@ -2392,27 +2712,33 @@
         <edmx:Include Namespace="Task.v1_0_6"/>
         <edmx:Include Namespace="Task.v1_0_7"/>
         <edmx:Include Namespace="Task.v1_0_8"/>
+        <edmx:Include Namespace="Task.v1_0_9"/>
         <edmx:Include Namespace="Task.v1_1_0"/>
         <edmx:Include Namespace="Task.v1_1_1"/>
         <edmx:Include Namespace="Task.v1_1_2"/>
         <edmx:Include Namespace="Task.v1_1_3"/>
         <edmx:Include Namespace="Task.v1_1_4"/>
         <edmx:Include Namespace="Task.v1_1_5"/>
+        <edmx:Include Namespace="Task.v1_1_6"/>
         <edmx:Include Namespace="Task.v1_2_0"/>
         <edmx:Include Namespace="Task.v1_2_1"/>
         <edmx:Include Namespace="Task.v1_2_2"/>
         <edmx:Include Namespace="Task.v1_2_3"/>
         <edmx:Include Namespace="Task.v1_2_4"/>
+        <edmx:Include Namespace="Task.v1_2_5"/>
         <edmx:Include Namespace="Task.v1_3_0"/>
         <edmx:Include Namespace="Task.v1_3_1"/>
         <edmx:Include Namespace="Task.v1_3_2"/>
         <edmx:Include Namespace="Task.v1_3_3"/>
         <edmx:Include Namespace="Task.v1_3_4"/>
+        <edmx:Include Namespace="Task.v1_3_5"/>
         <edmx:Include Namespace="Task.v1_4_0"/>
         <edmx:Include Namespace="Task.v1_4_1"/>
         <edmx:Include Namespace="Task.v1_4_2"/>
         <edmx:Include Namespace="Task.v1_4_3"/>
+        <edmx:Include Namespace="Task.v1_4_4"/>
         <edmx:Include Namespace="Task.v1_5_0"/>
+        <edmx:Include Namespace="Task.v1_5_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/TaskCollection_v1.xml">
         <edmx:Include Namespace="TaskCollection"/>
@@ -2427,12 +2753,14 @@
         <edmx:Include Namespace="TaskService.v1_0_6"/>
         <edmx:Include Namespace="TaskService.v1_0_7"/>
         <edmx:Include Namespace="TaskService.v1_0_8"/>
+        <edmx:Include Namespace="TaskService.v1_0_9"/>
         <edmx:Include Namespace="TaskService.v1_1_0"/>
         <edmx:Include Namespace="TaskService.v1_1_1"/>
         <edmx:Include Namespace="TaskService.v1_1_2"/>
         <edmx:Include Namespace="TaskService.v1_1_3"/>
         <edmx:Include Namespace="TaskService.v1_1_4"/>
         <edmx:Include Namespace="TaskService.v1_1_5"/>
+        <edmx:Include Namespace="TaskService.v1_1_6"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/TelemetryService_v1.xml">
         <edmx:Include Namespace="TelemetryService"/>
@@ -2440,12 +2768,16 @@
         <edmx:Include Namespace="TelemetryService.v1_0_1"/>
         <edmx:Include Namespace="TelemetryService.v1_0_2"/>
         <edmx:Include Namespace="TelemetryService.v1_0_3"/>
+        <edmx:Include Namespace="TelemetryService.v1_0_4"/>
         <edmx:Include Namespace="TelemetryService.v1_1_0"/>
         <edmx:Include Namespace="TelemetryService.v1_1_1"/>
         <edmx:Include Namespace="TelemetryService.v1_1_2"/>
         <edmx:Include Namespace="TelemetryService.v1_1_3"/>
+        <edmx:Include Namespace="TelemetryService.v1_1_4"/>
         <edmx:Include Namespace="TelemetryService.v1_2_0"/>
         <edmx:Include Namespace="TelemetryService.v1_2_1"/>
+        <edmx:Include Namespace="TelemetryService.v1_2_2"/>
+        <edmx:Include Namespace="TelemetryService.v1_3_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Thermal_v1.xml">
         <edmx:Include Namespace="Thermal"/>
@@ -2504,6 +2836,15 @@
         <edmx:Include Namespace="Thermal.v1_6_0"/>
         <edmx:Include Namespace="Thermal.v1_6_1"/>
         <edmx:Include Namespace="Thermal.v1_6_2"/>
+        <edmx:Include Namespace="Thermal.v1_7_0"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/ThermalMetrics_v1.xml">
+        <edmx:Include Namespace="ThermalMetrics"/>
+        <edmx:Include Namespace="ThermalMetrics.v1_0_0"/>
+    </edmx:Reference>
+    <edmx:Reference Uri="/redfish/v1/schema/ThermalSubsystem_v1.xml">
+        <edmx:Include Namespace="ThermalSubsystem"/>
+        <edmx:Include Namespace="ThermalSubsystem.v1_0_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Triggers_v1.xml">
         <edmx:Include Namespace="Triggers"/>
@@ -2512,9 +2853,11 @@
         <edmx:Include Namespace="Triggers.v1_0_2"/>
         <edmx:Include Namespace="Triggers.v1_0_3"/>
         <edmx:Include Namespace="Triggers.v1_0_4"/>
+        <edmx:Include Namespace="Triggers.v1_0_5"/>
         <edmx:Include Namespace="Triggers.v1_1_0"/>
         <edmx:Include Namespace="Triggers.v1_1_1"/>
         <edmx:Include Namespace="Triggers.v1_1_2"/>
+        <edmx:Include Namespace="Triggers.v1_1_3"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/TriggersCollection_v1.xml">
         <edmx:Include Namespace="TriggersCollection"/>
@@ -2531,6 +2874,7 @@
         <edmx:Include Namespace="UpdateService.v1_0_7"/>
         <edmx:Include Namespace="UpdateService.v1_0_8"/>
         <edmx:Include Namespace="UpdateService.v1_0_9"/>
+        <edmx:Include Namespace="UpdateService.v1_0_10"/>
         <edmx:Include Namespace="UpdateService.v1_1_0"/>
         <edmx:Include Namespace="UpdateService.v1_1_1"/>
         <edmx:Include Namespace="UpdateService.v1_1_2"/>
@@ -2540,6 +2884,7 @@
         <edmx:Include Namespace="UpdateService.v1_1_6"/>
         <edmx:Include Namespace="UpdateService.v1_1_7"/>
         <edmx:Include Namespace="UpdateService.v1_1_8"/>
+        <edmx:Include Namespace="UpdateService.v1_1_9"/>
         <edmx:Include Namespace="UpdateService.v1_2_0"/>
         <edmx:Include Namespace="UpdateService.v1_2_1"/>
         <edmx:Include Namespace="UpdateService.v1_2_2"/>
@@ -2548,30 +2893,37 @@
         <edmx:Include Namespace="UpdateService.v1_2_5"/>
         <edmx:Include Namespace="UpdateService.v1_2_6"/>
         <edmx:Include Namespace="UpdateService.v1_2_7"/>
+        <edmx:Include Namespace="UpdateService.v1_2_8"/>
         <edmx:Include Namespace="UpdateService.v1_3_0"/>
         <edmx:Include Namespace="UpdateService.v1_3_1"/>
         <edmx:Include Namespace="UpdateService.v1_3_2"/>
         <edmx:Include Namespace="UpdateService.v1_3_3"/>
         <edmx:Include Namespace="UpdateService.v1_3_4"/>
         <edmx:Include Namespace="UpdateService.v1_3_5"/>
+        <edmx:Include Namespace="UpdateService.v1_3_6"/>
         <edmx:Include Namespace="UpdateService.v1_4_0"/>
         <edmx:Include Namespace="UpdateService.v1_4_1"/>
         <edmx:Include Namespace="UpdateService.v1_4_2"/>
         <edmx:Include Namespace="UpdateService.v1_4_3"/>
         <edmx:Include Namespace="UpdateService.v1_4_4"/>
+        <edmx:Include Namespace="UpdateService.v1_4_5"/>
         <edmx:Include Namespace="UpdateService.v1_5_0"/>
         <edmx:Include Namespace="UpdateService.v1_5_1"/>
         <edmx:Include Namespace="UpdateService.v1_5_2"/>
         <edmx:Include Namespace="UpdateService.v1_5_3"/>
+        <edmx:Include Namespace="UpdateService.v1_5_4"/>
         <edmx:Include Namespace="UpdateService.v1_6_0"/>
         <edmx:Include Namespace="UpdateService.v1_6_1"/>
         <edmx:Include Namespace="UpdateService.v1_6_2"/>
+        <edmx:Include Namespace="UpdateService.v1_6_3"/>
         <edmx:Include Namespace="UpdateService.v1_7_0"/>
         <edmx:Include Namespace="UpdateService.v1_7_1"/>
         <edmx:Include Namespace="UpdateService.v1_7_2"/>
+        <edmx:Include Namespace="UpdateService.v1_7_3"/>
         <edmx:Include Namespace="UpdateService.v1_8_0"/>
         <edmx:Include Namespace="UpdateService.v1_8_1"/>
         <edmx:Include Namespace="UpdateService.v1_8_2"/>
+        <edmx:Include Namespace="UpdateService.v1_8_3"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/VCATEntry_v1.xml">
         <edmx:Include Namespace="VCATEntry"/>
@@ -2626,6 +2978,7 @@
         <edmx:Include Namespace="VLanNetworkInterface.v1_1_3"/>
         <edmx:Include Namespace="VLanNetworkInterface.v1_1_4"/>
         <edmx:Include Namespace="VLanNetworkInterface.v1_1_5"/>
+        <edmx:Include Namespace="VLanNetworkInterface.v1_2_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/VLanNetworkInterfaceCollection_v1.xml">
         <edmx:Include Namespace="VLanNetworkInterfaceCollection"/>
@@ -2648,14 +3001,20 @@
         <edmx:Include Namespace="Volume.v1_2_2"/>
         <edmx:Include Namespace="Volume.v1_2_3"/>
         <edmx:Include Namespace="Volume.v1_2_4"/>
+        <edmx:Include Namespace="Volume.v1_2_5"/>
         <edmx:Include Namespace="Volume.v1_3_0"/>
         <edmx:Include Namespace="Volume.v1_3_1"/>
         <edmx:Include Namespace="Volume.v1_3_2"/>
         <edmx:Include Namespace="Volume.v1_3_3"/>
+        <edmx:Include Namespace="Volume.v1_3_4"/>
         <edmx:Include Namespace="Volume.v1_4_0"/>
         <edmx:Include Namespace="Volume.v1_4_1"/>
         <edmx:Include Namespace="Volume.v1_4_2"/>
+        <edmx:Include Namespace="Volume.v1_4_3"/>
         <edmx:Include Namespace="Volume.v1_5_0"/>
+        <edmx:Include Namespace="Volume.v1_5_1"/>
+        <edmx:Include Namespace="Volume.v1_6_0"/>
+        <edmx:Include Namespace="Volume.v1_6_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/VolumeCollection_v1.xml">
         <edmx:Include Namespace="VolumeCollection"/>
@@ -2688,6 +3047,7 @@
         <edmx:Include Namespace="Zone.v1_4_1"/>
         <edmx:Include Namespace="Zone.v1_4_2"/>
         <edmx:Include Namespace="Zone.v1_5_0"/>
+        <edmx:Include Namespace="Zone.v1_6_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ZoneCollection_v1.xml">
         <edmx:Include Namespace="ZoneCollection"/>
diff --git a/static/redfish/v1/JsonSchemas/AccelerationFunction/AccelerationFunction.json b/static/redfish/v1/JsonSchemas/AccelerationFunction/AccelerationFunction.json
index dc1b17e..8c7e2b5 100644
--- a/static/redfish/v1/JsonSchemas/AccelerationFunction/AccelerationFunction.json
+++ b/static/redfish/v1/JsonSchemas/AccelerationFunction/AccelerationFunction.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AccelerationFunction.v1_0_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AccelerationFunction.v1_0_3.json",
     "$ref": "#/definitions/AccelerationFunction",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "AccelerationFunction": {
             "additionalProperties": false,
@@ -262,5 +262,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.3",
-    "title": "#AccelerationFunction.v1_0_2.AccelerationFunction"
+    "title": "#AccelerationFunction.v1_0_3.AccelerationFunction"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AccountService/AccountService.json b/static/redfish/v1/JsonSchemas/AccountService/AccountService.json
index c5da56d..cb6c347 100644
--- a/static/redfish/v1/JsonSchemas/AccountService/AccountService.json
+++ b/static/redfish/v1/JsonSchemas/AccountService/AccountService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AccountService.v1_7_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AccountService.v1_8_0.json",
     "$ref": "#/definitions/AccountService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -9,18 +9,24 @@
                 "RedfishService",
                 "ActiveDirectoryService",
                 "LDAPService",
-                "OEM"
+                "OEM",
+                "TACACSplus"
             ],
             "enumDescriptions": {
                 "ActiveDirectoryService": "An external Active Directory service.",
                 "LDAPService": "A generic external LDAP service.",
                 "OEM": "An OEM-specific external authentication or directory service.",
-                "RedfishService": "An external Redfish service."
+                "RedfishService": "An external Redfish service.",
+                "TACACSplus": "An external TACACS+ service."
             },
             "enumLongDescriptions": {
-                "ActiveDirectoryService": "The external account provider shall be a Microsoft Active Directory Technical Specification-comformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service.",
+                "ActiveDirectoryService": "The external account provider shall be a Microsoft Active Directory Technical Specification-conformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service.",
                 "LDAPService": "The external account provider shall be an RFC4511-conformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) that links to the set of LDAP servers for the service.",
-                "RedfishService": "The external account provider shall be a DMTF Redfish Specification-comformant service.  The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service."
+                "RedfishService": "The external account provider shall be a DMTF Redfish Specification-conformant service.  The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service.",
+                "TACACSplus": "The external account provider shall be an RFC8907-conformant service.  The ServiceAddresses format shall contain a set of host:port that correspond to a TACACS+ service and where the format for host and port are defined in RFC3986."
+            },
+            "enumVersionAdded": {
+                "TACACSplus": "v1_8_0"
             },
             "type": "string"
         },
@@ -72,7 +78,7 @@
                 },
                 "AccountLockoutDuration": {
                     "description": "The period of time, in seconds, that an account is locked after the number of failed login attempts reaches the account lockout threshold, within the period between the last failed login attempt and the reset of the lockout threshold counter.  If this value is `0`, no lockout will occur.  If the AccountLockoutCounterResetEnabled value is `false`, this property is ignored.",
-                    "longDescription": "This property shall contain the period of time, in seconds, that an account is locked after the number of failed login attempts reaches the AccountLockoutThreshold value, within the AccountLockoutCounterResetAfter window of time.  The value shall be greater than or equal to the AccountLockoutResetAfter value.  If this value is `0`, no lockout shall occur.  If AccountLockoutCounterResetEnabled value is `false`, this property shall be ignored.",
+                    "longDescription": "This property shall contain the period of time, in seconds, that an account is locked after the number of failed login attempts reaches the AccountLockoutThreshold value, within the AccountLockoutCounterResetAfter window of time.  The value shall be greater than or equal to the AccountLockoutCounterResetAfter value.  If this value is `0`, no lockout shall occur.  If AccountLockoutCounterResetEnabled value is `false`, this property shall be ignored.",
                     "minimum": 0,
                     "readonly": false,
                     "type": [
@@ -181,6 +187,26 @@
                     "readonly": true,
                     "versionAdded": "v1_1_0"
                 },
+                "RestrictedOemPrivileges": {
+                    "description": "The set of restricted OEM privileges.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall contain an array of OEM privileges that are restricted by the service.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_8_0"
+                },
+                "RestrictedPrivileges": {
+                    "description": "The set of restricted Redfish privileges.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Privileges.json#/definitions/PrivilegeType"
+                    },
+                    "longDescription": "This property shall contain an array of Redfish privileges that are restricted by the service.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_8_0"
+                },
                 "Roles": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/RoleCollection.json#/definitions/RoleCollection",
                     "description": "The collection of Redfish roles.",
@@ -200,6 +226,39 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
                     "longDescription": "This property shall contain any status or health properties of the resource."
+                },
+                "SupportedAccountTypes": {
+                    "description": "The account types supported by the service.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.json#/definitions/AccountTypes"
+                    },
+                    "longDescription": "This property shall contain an array of the account types supported by the service.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_8_0"
+                },
+                "SupportedOEMAccountTypes": {
+                    "description": "The OEM account types supported by the service.",
+                    "items": {
+                        "type": "string"
+                    },
+                    "longDescription": "This property shall contain an array of the OEM account types supported by the service.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_8_0"
+                },
+                "TACACSplus": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ExternalAccountProvider"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The first TACACS+ external account provider that this account service supports.",
+                    "longDescription": "This property shall contain the first TACACS+ external account provider that this account service supports.  If the account service supports one or more TACACS+ services as an external account provider, this entity shall be populated by default.  This entity shall not be present in the additional external account providers resource collection.",
+                    "versionAdded": "v1_8_0"
                 }
             },
             "required": [
@@ -271,6 +330,27 @@
                     "readonly": false,
                     "versionAdded": "v1_3_0"
                 },
+                "EncryptionKey": {
+                    "description": "Specifies the encryption key.",
+                    "longDescription": "This property shall contain the value of a symmetric encryption key for account services that support some form of encryption, obfuscation, or authentication such as TACACS+.  The value shall be `null` in responses.  The property shall accept a hexadecimal string whose length depends on the external account service, such as TACACS+.  A TACACS+ service shall use this property to specify the secret key as defined in RFC8907.",
+                    "pattern": "^[0-9a-fA-F]+$",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
+                "EncryptionKeySet": {
+                    "description": "Indicates if the EncryptionKey property is set.",
+                    "longDescription": "This property shall contain `true` if a valid value was provided for the EncryptionKey property.  Otherwise, the property shall contain `false`.  For a TACACS+ service, the value `false` shall indicate data obfuscation, as defined in section 4.5 of RFC8907, is disabled.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
                 "KerberosKeytab": {
                     "description": "The Base64-encoded version of the Kerberos keytab for this service.  A PATCH or PUT operation writes the keytab.  This property is `null` in responses.",
                     "longDescription": "This property shall contain a Base64-encoded version of the Kerberos keytab for this service.  A PATCH or PUT operation writes the keytab.  The value shall be `null` in responses.",
@@ -393,6 +473,17 @@
                     "type": "boolean",
                     "versionAdded": "v1_7_0"
                 },
+                "Priority": {
+                    "description": "The authentication priority for the external account provider.",
+                    "longDescription": "This property shall contain the assigned priority for the specified external account provider.  The value `0` value shall indicate the highest priority.  Increasing values shall represent decreasing priority.  If an external provider does not have a priority assignment or two or more external providers have the same priority, the behavior shall be determined by the Redfish service.  The priority is used to determine the order of authentication and authorization for each external account provider.",
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
                 "RemoteRoleMapping": {
                     "description": "The mapping rules to convert the external account providers account information to the local Redfish role.",
                     "items": {
@@ -431,6 +522,19 @@
                         "null"
                     ],
                     "versionAdded": "v1_3_0"
+                },
+                "TACACSplusService": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/TACACSplusService"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The additional information needed to parse a TACACS+ services.",
+                    "longDescription": "This property shall contain additional information needed to parse a TACACS+ services. This property should only be present inside a TACACSplus property.",
+                    "versionAdded": "v1_8_0"
                 }
             },
             "type": "object"
@@ -636,9 +740,82 @@
                 }
             },
             "type": "object"
+        },
+        "TACACSplusPasswordExchangeProtocol": {
+            "enum": [
+                "ASCII",
+                "PAP",
+                "CHAP",
+                "MSCHAPv1",
+                "MSCHAPv2"
+            ],
+            "enumDescriptions": {
+                "ASCII": "The ASCII Login method.",
+                "CHAP": "The CHAP Login method.",
+                "MSCHAPv1": "The MS-CHAP v1 Login method.",
+                "MSCHAPv2": "The MS-CHAP v2 Login method.",
+                "PAP": "The PAP Login method."
+            },
+            "enumLongDescriptions": {
+                "ASCII": "This value shall indicate the ASCII Login flow as described under section 5.4.2 of RFC8907.",
+                "CHAP": "This value shall indicate the CHAP Login flow as described under section 5.4.2 of RFC8907.",
+                "MSCHAPv1": "This value shall indicate the MS-CHAP v1 Login flow as described under section 5.4.2 of RFC8907.",
+                "MSCHAPv2": "This value shall indicate the MS-CHAP v2 Login flow as described under section 5.4.2 of RFC8907.",
+                "PAP": "This value shall indicate the PAP Login flow as described under section 5.4.2 of RFC8907."
+            },
+            "type": "string"
+        },
+        "TACACSplusService": {
+            "additionalProperties": false,
+            "description": "Various settings to parse a TACACS+ service.",
+            "longDescription": "This type shall contain settings for parsing a TACACS+ service.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "PasswordExchangeProtocols": {
+                    "description": "Indicates the allowed TACACS+ password exchange protocols.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/TACACSplusPasswordExchangeProtocol"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "This property shall indicate all the allowed TACACS+ password exchange protocol described under section 5.4.2 of RFC8907.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_8_0"
+                },
+                "PrivilegeLevelArgument": {
+                    "description": "Indicates the name of the TACACS+ argument name in an authorization request.",
+                    "longDescription": "This property shall specify the name of the argument in a TACACS+ Authorization REPLY packet body, as defined in RFC8907, that contains the user's privilege level.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                }
+            },
+            "type": "object"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.4",
-    "title": "#AccountService.v1_7_2.AccountService"
+    "release": "2020.4",
+    "title": "#AccountService.v1_8_0.AccountService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AddressPool/AddressPool.json b/static/redfish/v1/JsonSchemas/AddressPool/AddressPool.json
index 3e11f26..65fc800 100644
--- a/static/redfish/v1/JsonSchemas/AddressPool/AddressPool.json
+++ b/static/redfish/v1/JsonSchemas/AddressPool/AddressPool.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AddressPool.v1_1_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AddressPool.v1_1_1.json",
     "$ref": "#/definitions/AddressPool",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -232,7 +232,7 @@
                 },
                 "RequiredMinRxIntervalMilliseconds": {
                     "description": "Bidirectional Forwarding Detection (BFD) receive value.",
-                    "longDescription": "This property shall contain the Bidirectional Forwarding Detection (BFD) receive value.  The BFD recieve value determines how frequently (in milliseconds) BFD packets will be expected to be received from BFD peers.",
+                    "longDescription": "This property shall contain the Bidirectional Forwarding Detection (BFD) receive value.  The BFD receive value determines how frequently (in milliseconds) BFD packets will be expected to be received from BFD peers.",
                     "readonly": false,
                     "type": [
                         "integer",
@@ -285,8 +285,8 @@
                     "versionAdded": "v1_1_0"
                 },
                 "ARPSupressionEnabled": {
-                    "description": "Address Resolution Protocol (ARP) supression status.",
-                    "longDescription": "This property shall indicate whether Address Resolution Protocol (ARP) surpression is enabled.",
+                    "description": "Address Resolution Protocol (ARP) suppression status.",
+                    "longDescription": "This property shall indicate whether Address Resolution Protocol (ARP) suppression is enabled.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -364,8 +364,8 @@
                     "versionAdded": "v1_1_0"
                 },
                 "NDPSupressionEnabled": {
-                    "description": "Network Discovery Protocol (NDP) supression status.",
-                    "longDescription": "This property shall indicate whether Network Discovery Protocol (NDP) surpression is enabled.",
+                    "description": "Network Discovery Protocol (NDP) suppression status.",
+                    "longDescription": "This property shall indicate whether Network Discovery Protocol (NDP) suppression is enabled.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -467,7 +467,7 @@
                 },
                 "AllowOwnASEnabled": {
                     "description": "Allow own Autonomous System (AS) status.",
-                    "longDescription": "This property shall indicate whether the Autonomous System (AS) of the recieving router is permitted in a Border Gateway Protocol (BGP) update.  If `true`, routes should be received and processed even if the router detects its own ASN in the AS-Path.  If `false`, they should be dropped.",
+                    "longDescription": "This property shall indicate whether the Autonomous System (AS) of the receiving router is permitted in a Border Gateway Protocol (BGP) update.  If `true`, routes should be received and processed even if the router detects its own ASN in the AS-Path.  If `false`, they should be dropped.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -537,7 +537,7 @@
                         }
                     ],
                     "description": "Border Gateway Protocol (BGP) max prefix properties.",
-                    "longDescription": "These properties are appliable to configuring Border Gateway Protocol (BGP) max prefix related properties.",
+                    "longDescription": "These properties are applicable to configuring Border Gateway Protocol (BGP) max prefix related properties.",
                     "versionAdded": "v1_1_0"
                 },
                 "MinimumAdvertisementIntervalSeconds": {
@@ -646,7 +646,7 @@
                 },
                 "DistanceExternal": {
                     "description": "Route distance for external routes.",
-                    "longDescription": "This property shall modify the administrative distance for routes learned via External BGP (EBGP).",
+                    "longDescription": "This property shall modify the administrative distance for routes learned via External BGP (eBGP).",
                     "readonly": false,
                     "type": [
                         "integer",
@@ -656,7 +656,7 @@
                 },
                 "DistanceInternal": {
                     "description": "Route distance for internal routes.",
-                    "longDescription": "This property shall modify the administrative distance for routes learned via Internal BGP (IBGP).",
+                    "longDescription": "This property shall modify the administrative distance for routes learned via Internal BGP (iBGP).",
                     "readonly": false,
                     "type": [
                         "integer",
@@ -696,7 +696,7 @@
                 },
                 "SendDefaultRouteEnabled": {
                     "description": "Send default route status.",
-                    "longDescription": "This property shall indicate whether the default route should be advertized.  If `true`, the default route is advertised to all Border Gateway Protocol (BGP) neighbors unless specifically denied.  If `false`, the default route is not advertised.",
+                    "longDescription": "This property shall indicate whether the default route should be advertised.  If `true`, the default route is advertised to all Border Gateway Protocol (BGP) neighbors unless specifically denied.  If `false`, the default route is not advertised.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -762,7 +762,7 @@
                         }
                     ],
                     "description": "Border Gateway Protocol (BGP) route related properties.",
-                    "longDescription": "This property shall containBorder Gateway Protocol (BGP) route related properties.",
+                    "longDescription": "This property shall contain Border Gateway Protocol (BGP) route related properties.",
                     "versionAdded": "v1_1_0"
                 },
                 "GracefulRestart": {
@@ -824,7 +824,7 @@
             },
             "properties": {
                 "DHCPInterfaceMTUBytes": {
-                    "description": "Dynamic Host Configuration Protocl (DHCP) interface Maximum Transmission Unit (MTU).",
+                    "description": "Dynamic Host Configuration Protocol (DHCP) interface Maximum Transmission Unit (MTU).",
                     "longDescription": "This property shall contain the Maximum Transmission Unit (MTU) to use on this interface in bytes.",
                     "maximum": 9194,
                     "minimum": 68,
@@ -836,8 +836,8 @@
                     "versionAdded": "v1_1_0"
                 },
                 "DHCPRelayEnabled": {
-                    "description": "Dynamic Host Configuration Protocl (DHCP) relay status.",
-                    "longDescription": "This property shall indicate whether Dynamic Host Configuration Protocl (DHCP) Relay is enabled.",
+                    "description": "Dynamic Host Configuration Protocol (DHCP) relay status.",
+                    "longDescription": "This property shall indicate whether Dynamic Host Configuration Protocol (DHCP) Relay is enabled.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -863,8 +863,8 @@
         },
         "EBGP": {
             "additionalProperties": false,
-            "description": "External BGP (EBGP) related properties for an Ethernet fabric.",
-            "longDescription": "This type shall contain the External BGP (EBGP) related properties for an Ethernet fabric.",
+            "description": "External BGP (eBGP) related properties for an Ethernet fabric.",
+            "longDescription": "This type shall contain the External BGP (eBGP) related properties for an Ethernet fabric.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -895,7 +895,7 @@
                 },
                 "AllowDuplicateASEnabled": {
                     "description": "Allow duplicate Autonomous System (AS) path.",
-                    "longDescription": "This property shall indicate whether duplicate Autonomous System (AS) numbers are alllowed.  If `true`, routes with the same AS number as the recieving router should be allowed.  If `false`,routes should be dropped if the router recieves its own AS number in a Border Gateway Protocol (BGP) update.",
+                    "longDescription": "This property shall indicate whether duplicate Autonomous System (AS) numbers are allowed.  If `true`, routes with the same AS number as the receiving router should be allowed.  If `false`,routes should be dropped if the router receives its own AS number in a Border Gateway Protocol (BGP) update.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -956,7 +956,7 @@
                         }
                     ],
                     "description": "Border Gateway Protocol (BGP) route related properties.",
-                    "longDescription": "This property shall containBorder Gateway Protocol (BGP) route related properties.",
+                    "longDescription": "This property shall contain Border Gateway Protocol (BGP) route related properties.",
                     "versionAdded": "v1_1_0"
                 },
                 "BGPWeight": {
@@ -993,8 +993,8 @@
                     "versionAdded": "v1_1_0"
                 },
                 "MultihopEnabled": {
-                    "description": "External BGP (EBGP) multihop status.",
-                    "longDescription": "This property shall indicate whether External BGP (EBGP) multihop is enabled.",
+                    "description": "External BGP (eBGP) multihop status.",
+                    "longDescription": "This property shall indicate whether External BGP (eBGP) multihop is enabled.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -1003,8 +1003,8 @@
                     "versionAdded": "v1_1_0"
                 },
                 "MultihopTTL": {
-                    "description": "External BGP (EBGP) mutlihop Time to Live (TTL) value.",
-                    "longDescription": "This property shall contain the External BGP (EBGP) mutlihop Time to Live (TTL) value.",
+                    "description": "External BGP (eBGP) multihop Time to Live (TTL) value.",
+                    "longDescription": "This property shall contain the External BGP (eBGP) multihop Time to Live (TTL) value.",
                     "readonly": false,
                     "type": [
                         "integer",
@@ -1164,8 +1164,8 @@
                             "type": "null"
                         }
                     ],
-                    "description": "External BGP (EBGP) related properties for this Ethernet fabric.",
-                    "longDescription": "This property shall contain the External BGP (EBGP) related properties for this Ethernet fabric.",
+                    "description": "External BGP (eBGP) related properties for this Ethernet fabric.",
+                    "longDescription": "This property shall contain the External BGP (eBGP) related properties for this Ethernet fabric.",
                     "versionAdded": "v1_1_0"
                 },
                 "IPv4": {
@@ -1190,8 +1190,8 @@
                             "type": "null"
                         }
                     ],
-                    "description": "Multi Protocol EBGP (MP EBGP) related properties for this Ethernet fabric.",
-                    "longDescription": "This property shall contain the Multi Protocol EBGP (MP EBGP) related properties for this Ethernet fabric.",
+                    "description": "Multi Protocol eBGP (MP eBGP) related properties for this Ethernet fabric.",
+                    "longDescription": "This property shall contain the Multi Protocol eBGP (MP eBGP) related properties for this Ethernet fabric.",
                     "versionAdded": "v1_1_0"
                 },
                 "MultiProtocolIBGP": {
@@ -1203,8 +1203,8 @@
                             "type": "null"
                         }
                     ],
-                    "description": "Multi Protocol IBGP (MP IBGP) related properties for this Ethernet fabric.",
-                    "longDescription": "This property shall contain the Multi Protocol IBGP (MP IBGP) related properties for this Ethernet fabric.",
+                    "description": "Multi Protocol iBGP (MP iBGP) related properties for this Ethernet fabric.",
+                    "longDescription": "This property shall contain the Multi Protocol iBGP (MP iBGP) related properties for this Ethernet fabric.",
                     "versionAdded": "v1_1_0"
                 }
             },
@@ -1299,7 +1299,7 @@
             "properties": {
                 "GracefulRestartEnabled": {
                     "description": "Border Gateway Protocol (BGP) graceful restart status.",
-                    "longDescription": "This property shall indicate whethere to enable Border Gateway Protocol (BGP) graceful restart features.",
+                    "longDescription": "This property shall indicate whether to enable Border Gateway Protocol (BGP) graceful restart features.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -1437,8 +1437,8 @@
                             "type": "null"
                         }
                     ],
-                    "description": "External BGP (EBGP) related addressing for this Ethernet fabric.",
-                    "longDescription": "This property shall contain the range of IPv4 addresses assigned to External BGP (EBGP).",
+                    "description": "External BGP (eBGP) related addressing for this Ethernet fabric.",
+                    "longDescription": "This property shall contain the range of IPv4 addresses assigned to External BGP (eBGP).",
                     "versionAdded": "v1_1_0"
                 },
                 "FabricLinkAddressRange": {
@@ -1487,8 +1487,8 @@
                             "type": "null"
                         }
                     ],
-                    "description": "Internal BGP (IBGP) related addressing for this Ethernet fabric.",
-                    "longDescription": "This property shall contain the range of IPv4 addresses assigned to Internal BGP (IBGP).",
+                    "description": "Internal BGP (iBGP) related addressing for this Ethernet fabric.",
+                    "longDescription": "This property shall contain the range of IPv4 addresses assigned to Internal BGP (iBGP).",
                     "versionAdded": "v1_1_0"
                 },
                 "LoopbackAddressRange": {
@@ -1714,7 +1714,7 @@
                 },
                 "ShutdownThresholdPercentage": {
                     "description": "Shutdown threshold status.",
-                    "longDescription": "This property shall contain the percentage of the maximum prefix recieved value at which the router starts to generate a warning message.",
+                    "longDescription": "This property shall contain the percentage of the maximum prefix received value at which the router starts to generate a warning message.",
                     "maximum": 100,
                     "minimum": 1,
                     "readonly": false,
@@ -1928,5 +1928,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#AddressPool.v1_1_0.AddressPool"
+    "title": "#AddressPool.v1_1_1.AddressPool"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Aggregate/Aggregate.json b/static/redfish/v1/JsonSchemas/Aggregate/Aggregate.json
index 023098b..3cdd0a6 100644
--- a/static/redfish/v1/JsonSchemas/Aggregate/Aggregate.json
+++ b/static/redfish/v1/JsonSchemas/Aggregate/Aggregate.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Aggregate.v1_0_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Aggregate.v1_0_1.json",
     "$ref": "#/definitions/Aggregate",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -329,5 +329,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.2",
-    "title": "#Aggregate.v1_0_0.Aggregate"
+    "title": "#Aggregate.v1_0_1.Aggregate"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json b/static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json
index 1f4e52e..f0c1394 100644
--- a/static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json
+++ b/static/redfish/v1/JsonSchemas/AggregationService/AggregationService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationService.v1_0_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationService.v1_0_1.json",
     "$ref": "#/definitions/AggregationService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -264,5 +264,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.2",
-    "title": "#AggregationService.v1_0_0.AggregationService"
+    "title": "#AggregationService.v1_0_1.AggregationService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json b/static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json
index f9fcdc4..4860130 100644
--- a/static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json
+++ b/static/redfish/v1/JsonSchemas/AggregationSource/AggregationSource.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationSource.v1_0_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AggregationSource.v1_1_0.json",
     "$ref": "#/definitions/AggregationSource",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -115,6 +115,19 @@
                         "null"
                     ]
                 },
+                "SNMP": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPSettings"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "SNMP settings of the aggregation source.",
+                    "longDescription": "This property shall contain the SNMP settings of the aggregation source.",
+                    "versionAdded": "v1_1_0"
+                },
                 "UserName": {
                     "description": "The user name for accessing the aggregation source.",
                     "longDescription": "This property shall contain the user name for accessing the aggregation source.",
@@ -209,9 +222,146 @@
             },
             "properties": {},
             "type": "object"
+        },
+        "SNMPAuthenticationProtocols": {
+            "enum": [
+                "None",
+                "CommunityString",
+                "HMAC_MD5",
+                "HMAC_SHA96",
+                "HMAC128_SHA224",
+                "HMAC192_SHA256",
+                "HMAC256_SHA384",
+                "HMAC384_SHA512"
+            ],
+            "enumDescriptions": {
+                "CommunityString": "Trap community string authentication.",
+                "HMAC128_SHA224": "HMAC-128-SHA-224 authentication.",
+                "HMAC192_SHA256": "HMAC-192-SHA-256 authentication.",
+                "HMAC256_SHA384": "HMAC-256-SHA-384 authentication.",
+                "HMAC384_SHA512": "HMAC-384-SHA-512 authentication.",
+                "HMAC_MD5": "HMAC-MD5-96 authentication.",
+                "HMAC_SHA96": "HMAC-SHA-96 authentication.",
+                "None": "No authentication."
+            },
+            "enumLongDescriptions": {
+                "CommunityString": "This value shall indicate authentication using SNMP community strings and the value of TrapCommunity.",
+                "HMAC128_SHA224": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC128SHA224AuthProtocol.",
+                "HMAC192_SHA256": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC192SHA256AuthProtocol.",
+                "HMAC256_SHA384": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC256SHA384AuthProtocol.",
+                "HMAC384_SHA512": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC384SHA512AuthProtocol.",
+                "HMAC_MD5": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol.",
+                "HMAC_SHA96": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol.",
+                "None": "This value shall indicate authentication is not required."
+            },
+            "type": "string"
+        },
+        "SNMPEncryptionProtocols": {
+            "enum": [
+                "None",
+                "CBC_DES",
+                "CFB128_AES128"
+            ],
+            "enumDescriptions": {
+                "CBC_DES": "CBC-DES encryption.",
+                "CFB128_AES128": "CFB128-AES-128 encryption.",
+                "None": "No encryption."
+            },
+            "enumLongDescriptions": {
+                "CBC_DES": "This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol.",
+                "CFB128_AES128": "This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol.",
+                "None": "This value shall indicate there is no encryption."
+            },
+            "type": "string"
+        },
+        "SNMPSettings": {
+            "additionalProperties": false,
+            "description": "Settings for an SNMP aggregation source.",
+            "longDescription": "This type shall contain the settings for an SNMP aggregation source.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AuthenticationKey": {
+                    "description": "The secret authentication key for SNMPv3.",
+                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
+                    "pattern": "(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\\*+$)",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_1_0"
+                },
+                "AuthenticationKeySet": {
+                    "description": "Indicates if the AuthenticationKey property is set.",
+                    "longDescription": "This property shall contain `true` if a valid value was provided for the AuthenticationKey property.  Otherwise, the property shall contain `false`.",
+                    "readonly": true,
+                    "type": "boolean",
+                    "versionAdded": "v1_1_0"
+                },
+                "AuthenticationProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPAuthenticationProtocols"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The authentication protocol for SNMPv3.",
+                    "longDescription": "This property shall contain the SNMPv3 authentication protocol.",
+                    "readonly": false,
+                    "versionAdded": "v1_1_0"
+                },
+                "EncryptionKey": {
+                    "description": "The secret authentication key for SNMPv3.",
+                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
+                    "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_1_0"
+                },
+                "EncryptionKeySet": {
+                    "description": "Indicates if the EncryptionKey property is set.",
+                    "longDescription": "This property shall contain `true` if a valid value was provided for the EncryptionKey property.  Otherwise, the property shall contain `false`.",
+                    "readonly": true,
+                    "type": "boolean",
+                    "versionAdded": "v1_1_0"
+                },
+                "EncryptionProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPEncryptionProtocols"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The encryption protocol for SNMPv3.",
+                    "longDescription": "This property shall contain the SNMPv3 encryption protocol.",
+                    "readonly": false,
+                    "versionAdded": "v1_1_0"
+                }
+            },
+            "type": "object"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.2",
-    "title": "#AggregationSource.v1_0_0.AggregationSource"
+    "release": "2020.4",
+    "title": "#AggregationSource.v1_1_0.AggregationSource"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json b/static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json
index 2208fdf..ab827fe 100644
--- a/static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json
+++ b/static/redfish/v1/JsonSchemas/AttributeRegistry/AttributeRegistry.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/AttributeRegistry.v1_3_4.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/AttributeRegistry.v1_3_5.json",
     "$ref": "#/definitions/AttributeRegistry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -919,5 +919,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.3",
-    "title": "#AttributeRegistry.v1_3_4.AttributeRegistry"
+    "title": "#AttributeRegistry.v1_3_5.AttributeRegistry"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Certificate/Certificate.json b/static/redfish/v1/JsonSchemas/Certificate/Certificate.json
index 9d9eb57..a349697 100644
--- a/static/redfish/v1/JsonSchemas/Certificate/Certificate.json
+++ b/static/redfish/v1/JsonSchemas/Certificate/Certificate.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_2_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_2_2.json",
     "$ref": "#/definitions/Certificate",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -277,7 +277,7 @@
             },
             "additionalProperties": false,
             "description": "This action generates a new key-pair for a certificate and produces a certificate signing request.",
-            "longDescription": "This action shall use the certificate data to generate a new key-pair for a certificate.  The response shall contain a signing request that a certificate authority (CA) must sign.  The service should retain the private key that generated this request for installation of the certificate.  The private key should not be part of the response.  The private key should not be part of the response.",
+            "longDescription": "This action shall use the certificate data to generate a new key-pair for a certificate.  The response shall contain a signing request that a certificate authority (CA) will sign.  The service should retain the private key that generated this request for installation of the certificate.  The private key should not be part of the response.  The private key should not be part of the response.",
             "parameters": {
                 "ChallengePassword": {
                     "description": "The challenge password to apply to the certificate for revocation requests.",
@@ -374,7 +374,7 @@
             },
             "additionalProperties": false,
             "description": "This action generates a certificate signing request by using the existing information and key-pair of the certificate.",
-            "longDescription": "This action shall generate a certificate signing request using the existing information and key-pair of the certificate.  The response shall contain a signing request that a certificate authority (CA) must sign.  The service should retain the private key that this request generates for when the certificate is installed.  The private key should not be part of the response.",
+            "longDescription": "This action shall generate a certificate signing request using the existing information and key-pair of the certificate.  The response shall contain a signing request that a certificate authority (CA) will sign.  The service should retain the private key that this request generates for when the certificate is installed.  The private key should not be part of the response.",
             "parameters": {
                 "ChallengePassword": {
                     "description": "The challenge password to apply to the certificate for revocation requests.",
@@ -453,5 +453,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.1",
-    "title": "#Certificate.v1_2_1.Certificate"
+    "title": "#Certificate.v1_2_2.Certificate"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json b/static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json
index 0457f93..ff19521 100644
--- a/static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json
+++ b/static/redfish/v1/JsonSchemas/CertificateService/CertificateService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CertificateService.v1_0_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CertificateService.v1_0_4.json",
     "$ref": "#/definitions/CertificateService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -118,7 +118,7 @@
             },
             "additionalProperties": false,
             "description": "This action makes a certificate signing request.",
-            "longDescription": "This action shall make a certificate signing request.  The response shall contain a signing request that a certificate authority (CA) must sign.  The service should retain the private key that was generated during this request for installation of the certificate.  The private key should not be part of the response.",
+            "longDescription": "This action shall make a certificate signing request.  The response shall contain a signing request that a certificate authority (CA) will sign.  The service should retain the private key that was generated during this request for installation of the certificate.  The private key should not be part of the response.",
             "parameters": {
                 "AlternativeNames": {
                     "description": "The additional host names of the component to secure.",
@@ -369,5 +369,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.3",
-    "title": "#CertificateService.v1_0_3.CertificateService"
+    "title": "#CertificateService.v1_0_4.CertificateService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Chassis/Chassis.json b/static/redfish/v1/JsonSchemas/Chassis/Chassis.json
index 857bed3..dfbc86c 100644
--- a/static/redfish/v1/JsonSchemas/Chassis/Chassis.json
+++ b/static/redfish/v1/JsonSchemas/Chassis/Chassis.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_14_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_15_0.json",
     "$ref": "#/definitions/Chassis",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -86,6 +86,13 @@
                         "null"
                     ]
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_15_0"
+                },
                 "ChassisType": {
                     "$ref": "#/definitions/ChassisType",
                     "description": "The type of physical form factor of the chassis.",
@@ -121,6 +128,13 @@
                     "longDescription": "This property shall contain a link to a resource collection of type DriveCollection.",
                     "versionAdded": "v1_14_0"
                 },
+                "EnvironmentMetrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json#/definitions/EnvironmentMetrics",
+                    "description": "The link to the environment metrics for this chassis.",
+                    "longDescription": "This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this chassis.",
+                    "readonly": true,
+                    "versionAdded": "v1_15_0"
+                },
                 "EnvironmentalClass": {
                     "anyOf": [
                         {
@@ -213,6 +227,15 @@
                     "units": "W",
                     "versionAdded": "v1_12_0"
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_15_0"
+                },
                 "MediaControllers": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/MediaControllerCollection.json#/definitions/MediaControllerCollection",
                     "description": "The link to the collection of media controllers located in this chassis.",
@@ -301,9 +324,11 @@
                 },
                 "Power": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Power.json#/definitions/Power",
+                    "deprecated": "This link has been deprecated in favor of the PowerSubsystem link property.",
                     "description": "The link to the power properties, or power supplies, power policies, and sensors, for this chassis.",
                     "longDescription": "This property shall contain a link to a resource of type Power that represents the power characteristics of this chassis.",
-                    "readonly": true
+                    "readonly": true,
+                    "versionDeprecated": "v1_15_0"
                 },
                 "PowerState": {
                     "anyOf": [
@@ -319,6 +344,13 @@
                     "readonly": true,
                     "versionAdded": "v1_0_1"
                 },
+                "PowerSubsystem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/PowerSubsystem.json#/definitions/PowerSubsystem",
+                    "description": "The link to the power subsystem properties for this chassis.",
+                    "longDescription": "This property shall contain a link to a resource of type PowerSubsystem that represents the power subsystem information for this chassis.",
+                    "readonly": true,
+                    "versionAdded": "v1_15_0"
+                },
                 "SKU": {
                     "description": "The SKU of the chassis.",
                     "longDescription": "This property shall contain the stock-keeping unit number for this chassis.",
@@ -351,9 +383,18 @@
                 },
                 "Thermal": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Thermal.json#/definitions/Thermal",
+                    "deprecated": "This link has been deprecated in favor of the ThermalSubsystem link property.",
                     "description": "The link to the thermal properties, such as fans, cooling, and sensors, for this chassis.",
                     "longDescription": "This property shall contain a link to a resource of type Thermal that represents the thermal characteristics of this chassis.",
-                    "readonly": true
+                    "readonly": true,
+                    "versionDeprecated": "v1_15_0"
+                },
+                "ThermalSubsystem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/ThermalSubsystem.json#/definitions/ThermalSubsystem",
+                    "description": "The link to the thermal subsystem properties for this chassis.",
+                    "longDescription": "This property shall contain a link to a resource of type ThermalSubsystem that represents the thermal subsystem information for this chassis.",
+                    "readonly": true,
+                    "versionAdded": "v1_15_0"
                 },
                 "UUID": {
                     "anyOf": [
@@ -852,6 +893,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Chassis.v1_14_0.Chassis"
+    "release": "2020.4",
+    "title": "#Chassis.v1_15_0.Chassis"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Circuit/Circuit.json b/static/redfish/v1/JsonSchemas/Circuit/Circuit.json
index ed79313..ced7f6b 100644
--- a/static/redfish/v1/JsonSchemas/Circuit/Circuit.json
+++ b/static/redfish/v1/JsonSchemas/Circuit/Circuit.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Circuit.v1_1_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Circuit.v1_2_0.json",
     "$ref": "#/definitions/Circuit",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -142,7 +142,7 @@
                 },
                 "CriticalCircuit": {
                     "description": "Designates if this is a critical circuit.",
-                    "longDescription": "This property shall indicate whether the circuit is desginated as a critical circuit, and therefore is excluded from autonomous logic that could affect the state of the circuit.  The value shall be `true` if the circuit is deemed critical, and `false` if the circuit is not critical.",
+                    "longDescription": "This property shall indicate whether the circuit is designated as a critical circuit, and therefore is excluded from autonomous logic that could affect the state of the circuit.  The value shall be `true` if the circuit is deemed critical, and `false` if the circuit is not critical.",
                     "readonly": false,
                     "type": [
                         "boolean",
@@ -520,7 +520,7 @@
                     ],
                     "description": "Line 1 current sensor.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain a CurrentSensor excerpt that measures current for L1.  This property shall not be present if the circuit does not include an L1 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Current that measures current for L1.  This property shall not be present if the circuit does not include an L1 measurement.",
                     "readonly": true
                 },
                 "Line2": {
@@ -534,7 +534,7 @@
                     ],
                     "description": "Line 2 current sensor.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain a CurrentSensor excerpt that measures current for L2.  This property shall not be present if the circuit does not include an L2 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Current that measures current for L2.  This property shall not be present if the circuit does not include an L2 measurement.",
                     "readonly": true
                 },
                 "Line3": {
@@ -548,7 +548,7 @@
                     ],
                     "description": "Line 3 current sensor.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain a CurrentSensor excerpt that measures current for L3.  This property shall not be present if the circuit does not include an L3 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Current that measures current for L3.  This property shall not be present if the circuit does not include an L3 measurement.",
                     "readonly": true
                 },
                 "Neutral": {
@@ -562,7 +562,7 @@
                     ],
                     "description": "Neutral line current sensor.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain a CurrentSensor excerpt that measures current for the Neutral line.  This property shall not be present if the circuit does not include a Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Current that measures current for the Neutral line.  This property shall not be present if the circuit does not include a Neutral measurement.",
                     "readonly": true
                 }
             },
@@ -598,7 +598,7 @@
                     ],
                     "description": "The Line 1 to Line 2 energy reading for this circuit.",
                     "excerptCopy": "SensorEnergykWhExcerpt",
-                    "longDescription": "This property shall contain a EnergykWhSensor excerpt that measures energy between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement.",
                     "readonly": true
                 },
                 "Line1ToNeutral": {
@@ -612,7 +612,7 @@
                     ],
                     "description": "The Line 1 to Neutral energy reading for this circuit.",
                     "excerptCopy": "SensorEnergykWhExcerpt",
-                    "longDescription": "This property shall contain a EnergykWhSensor excerpt that measures energy between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement.",
                     "readonly": true
                 },
                 "Line2ToLine3": {
@@ -626,7 +626,7 @@
                     ],
                     "description": "The Line 2 to Line 3 energy reading for this circuit.",
                     "excerptCopy": "SensorEnergykWhExcerpt",
-                    "longDescription": "This property shall contain a EnergykWhSensor excerpt that measures energy between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement.",
                     "readonly": true
                 },
                 "Line2ToNeutral": {
@@ -640,7 +640,7 @@
                     ],
                     "description": "The Line 2 to Neutral energy reading for this circuit.",
                     "excerptCopy": "SensorEnergykWhExcerpt",
-                    "longDescription": "This property shall contain a EnergykWhSensor excerpt that measures energy between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement.",
                     "readonly": true
                 },
                 "Line3ToLine1": {
@@ -654,7 +654,7 @@
                     ],
                     "description": "The Line 3 to Line 1 energy reading for this circuit.",
                     "excerptCopy": "SensorEnergykWhExcerpt",
-                    "longDescription": "This property shall contain a EnergykWhSensor excerpt that measures energy between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement.",
                     "readonly": true
                 },
                 "Line3ToNeutral": {
@@ -668,7 +668,7 @@
                     ],
                     "description": "The Line 3 to Neutral energy reading for this circuit.",
                     "excerptCopy": "SensorEnergykWhExcerpt",
-                    "longDescription": "This property shall contain a EnergykWhSensor excerpt that measures energy between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement.",
                     "readonly": true
                 }
             },
@@ -815,7 +815,7 @@
                     ],
                     "description": "The Line 1 to Line 2 power reading for this circuit.",
                     "excerptCopy": "SensorPowerExcerpt",
-                    "longDescription": "This property shall contain a PowerSensor excerpt that measures power between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Power that measures power between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement.",
                     "readonly": true
                 },
                 "Line1ToNeutral": {
@@ -829,7 +829,7 @@
                     ],
                     "description": "The Line 1 to Neutral power reading for this circuit.",
                     "excerptCopy": "SensorPowerExcerpt",
-                    "longDescription": "This property shall contain a PowerSensor excerpt that measures power between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Power that measures power between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement.",
                     "readonly": true
                 },
                 "Line2ToLine3": {
@@ -843,7 +843,7 @@
                     ],
                     "description": "The Line 2 to Line 3 power reading for this circuit.",
                     "excerptCopy": "SensorPowerExcerpt",
-                    "longDescription": "This property shall contain a PowerSensor excerpt that measures power between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement.",
+                    "longDescription": "This property shall contain a sensor excerpt of type Power that measures power between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement.",
                     "readonly": true
                 },
                 "Line2ToNeutral": {
@@ -857,7 +857,7 @@
                     ],
                     "description": "The Line 2 to Neutral power reading for this circuit.",
                     "excerptCopy": "SensorPowerExcerpt",
-                    "longDescription": "This property shall contain a PowerSensor excerpt that measures power between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Power that measures power between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement.",
                     "readonly": true
                 },
                 "Line3ToLine1": {
@@ -871,7 +871,7 @@
                     ],
                     "description": "The Line 3 to Line 1 power reading for this circuit.",
                     "excerptCopy": "SensorPowerExcerpt",
-                    "longDescription": "This property shall contain a PowerSensor excerpt that measures power between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Power that measures power between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement.",
                     "readonly": true
                 },
                 "Line3ToNeutral": {
@@ -885,7 +885,7 @@
                     ],
                     "description": "The Line 3 to Neutral power reading for this circuit.",
                     "excerptCopy": "SensorPowerExcerpt",
-                    "longDescription": "This property shall contain a PowerSensor excerpt that measures power between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Power that measures power between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement.",
                     "readonly": true
                 }
             },
@@ -953,7 +953,7 @@
                     ],
                     "description": "The Line 1 to Line 2 voltage reading for this circuit.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement.",
                     "readonly": true
                 },
                 "Line1ToNeutral": {
@@ -967,7 +967,7 @@
                     ],
                     "description": "The Line 1 to Neutral voltage reading for this circuit.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement.",
                     "readonly": true
                 },
                 "Line2ToLine3": {
@@ -981,7 +981,7 @@
                     ],
                     "description": "The Line 2 to Line 3 voltage reading for this circuit.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement.",
                     "readonly": true
                 },
                 "Line2ToNeutral": {
@@ -995,7 +995,7 @@
                     ],
                     "description": "The Line 2 to Neutral voltage reading for this circuit.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement.",
                     "readonly": true
                 },
                 "Line3ToLine1": {
@@ -1009,7 +1009,7 @@
                     ],
                     "description": "The Line 3 to Line 1 voltage reading for this circuit.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement.",
                     "readonly": true
                 },
                 "Line3ToNeutral": {
@@ -1023,7 +1023,7 @@
                     ],
                     "description": "The Line 3 to Neutral voltage reading for this circuit.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement.",
                     "readonly": true
                 }
             },
@@ -1042,6 +1042,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Circuit.v1_1_0.Circuit"
+    "release": "2020.4",
+    "title": "#Circuit.v1_2_0.Circuit"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/CollectionCapabilities/CollectionCapabilities.json b/static/redfish/v1/JsonSchemas/CollectionCapabilities/CollectionCapabilities.json
index a9f680d..0767b59 100644
--- a/static/redfish/v1/JsonSchemas/CollectionCapabilities/CollectionCapabilities.json
+++ b/static/redfish/v1/JsonSchemas/CollectionCapabilities/CollectionCapabilities.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/CollectionCapabilities.v1_2_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/CollectionCapabilities.v1_2_2.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -152,5 +152,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.2",
-    "title": "#CollectionCapabilities.v1_2_1"
+    "title": "#CollectionCapabilities.v1_2_2"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json b/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json
index 9d797cd..227ef23 100644
--- a/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json
+++ b/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_13_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_14_0.json",
     "$ref": "#/definitions/ComputerSystem",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -253,7 +253,7 @@
                         }
                     ],
                     "description": "The current boot source to use at the next boot instead of the normal boot device, if BootSourceOverrideEnabled is `true`.",
-                    "longDescription": "This property shall contain the source to boot the system from, overriding the normal boot order.  The Redfish.AllowableValues annotation specifies the valid values for this property.  `Pxe` indicates to PXE boot from the primary NIC; `Floppy`, `Cd`, `Usb`, and `Hdd` indicate to boot from their devices respectively.  `BiosSetup` indicates to boot into the native BIOS screen setup.  `Utilities` and `Diags` indicate to boot from the local utilities or diags partitions.  `UefiTarget` indicates to boot from the UEFI device path found in UefiTargetBootSourceOverride.  `UefiBootNext` indicates to boot from the UEFI BootOptionReference found in BootNext.  Changes to this property do not alter the BIOS persistent boot order configuration.",
+                    "longDescription": "This property shall contain the source to boot the system from, overriding the normal boot order.  The Redfish.AllowableValues annotation specifies the valid values for this property.  `Pxe` indicates to PXE boot from the primary NIC; `Floppy`, `Cd`, `Usb`, and `Hdd` indicate to boot from their devices respectively.  `BiosSetup` indicates to boot into the native BIOS screen setup.  `Utilities` and `Diags` indicate to boot from the local utilities or diagnostics partitions.  `UefiTarget` indicates to boot from the UEFI device path found in UefiTargetBootSourceOverride.  `UefiBootNext` indicates to boot from the UEFI BootOptionReference found in BootNext.  Changes to this property do not alter the BIOS persistent boot order configuration.",
                     "readonly": false
                 },
                 "Certificates": {
@@ -285,6 +285,20 @@
                     ],
                     "versionAdded": "v1_11_0"
                 },
+                "TrustedModuleRequiredToBoot": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/TrustedModuleRequiredToBoot"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The Trusted Module boot requirement.",
+                    "longDescription": "This property shall contain the Trusted Module boot requirement.",
+                    "readonly": false,
+                    "versionAdded": "v1_14_0"
+                },
                 "UefiTargetBootSourceOverride": {
                     "description": "The UEFI device path of the device from which to boot when BootSourceOverrideTarget is `UefiTarget`.",
                     "longDescription": "This property shall contain the UEFI device path of the override boot target.  Changes to this property do not alter the BIOS persistent boot order configuration.",
@@ -514,6 +528,13 @@
                     "longDescription": "This object shall contain the last boot progress state and time.",
                     "versionAdded": "v1_13_0"
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_14_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -632,6 +653,15 @@
                         "null"
                     ]
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_14_0"
+                },
                 "Memory": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/MemoryCollection.json#/definitions/MemoryCollection",
                     "description": "The link to the collection of memory associated with this system.",
@@ -837,7 +867,7 @@
                 },
                 "SubModel": {
                     "description": "The sub-model for this system.",
-                    "longDescription": "This property shall contain the information about the sub-model (or config) of the system.  This shall not include the model/product name or the manufacturer name.",
+                    "longDescription": "This property shall contain the information about the sub-model (or configuration) of the system.  This shall not include the model/product name or the manufacturer name.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1413,9 +1443,20 @@
                 }
             },
             "properties": {
+                "CoreCount": {
+                    "description": "The number of processor cores in the system.",
+                    "longDescription": "This property shall contain the total number of central processor cores in in the system.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_14_0"
+                },
                 "Count": {
                     "description": "The number of physical processors in the system.",
-                    "longDescription": "This property shall contain the number of physical central processors in the system.",
+                    "longDescription": "This property shall contain the total number of physical central processors in the system.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -1425,7 +1466,7 @@
                 },
                 "LogicalProcessorCount": {
                     "description": "The number of logical processors in the system.",
-                    "longDescription": "This property shall contain the number of logical central processors in the system.",
+                    "longDescription": "This property shall contain the total number of logical central processors in the system.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -1667,15 +1708,30 @@
                 "Composed": "A SystemType of Composed typically represents a single system constructed from disaggregated resources through the Redfish composition service.",
                 "OS": "A SystemType of OS typically represents an OS or hypervisor view of the system.",
                 "Physical": "A SystemType of Physical typically represents the hardware aspects of a system, such as a management controller.",
-                "PhysicallyPartitioned": "A SystemType of PhysicallyPartition typically represents a single system constructed from one or more physical systems through a firmware or hardware-based service.",
+                "PhysicallyPartitioned": "A SystemType of PhysicallyPartitioned typically represents a single system constructed from one or more physical systems through a firmware or hardware-based service.",
                 "Virtual": "A SystemType of Virtual typically represents a system that is actually a virtual machine instance.",
-                "VirtuallyPartitioned": "A SystemType of VirtuallyPartition typically represents a single system constructed from one or more virtual systems through a software-based service."
+                "VirtuallyPartitioned": "A SystemType of VirtuallyPartitioned typically represents a single system constructed from one or more virtual systems through a software-based service."
             },
             "enumVersionAdded": {
                 "Composed": "v1_4_0"
             },
             "type": "string"
         },
+        "TrustedModuleRequiredToBoot": {
+            "enum": [
+                "Disabled",
+                "Required"
+            ],
+            "enumDescriptions": {
+                "Disabled": "No Trusted Module requirement to boot.",
+                "Required": "A functional Trusted Module is required to boot."
+            },
+            "enumLongDescriptions": {
+                "Disabled": "This value shall indicate a Trusted Module is not required to boot.",
+                "Required": "This value shall indicate a functioning Trusted Module is required to boot."
+            },
+            "type": "string"
+        },
         "TrustedModules": {
             "additionalProperties": false,
             "description": "The Trusted Module installed in the system.",
@@ -1697,7 +1753,7 @@
             "properties": {
                 "FirmwareVersion": {
                     "description": "The firmware version of this Trusted Module.",
-                    "longDescription": "This property shall contain the firwmare version as defined by the manufacturer for the Trusted Module.",
+                    "longDescription": "This property shall contain the firmware version as defined by the manufacturer for the Trusted Module.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1914,6 +1970,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#ComputerSystem.v1_13_0.ComputerSystem"
+    "release": "2020.4",
+    "title": "#ComputerSystem.v1_14_0.ComputerSystem"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Drive/Drive.json b/static/redfish/v1/JsonSchemas/Drive/Drive.json
index 47e209b..e9e8908 100644
--- a/static/redfish/v1/JsonSchemas/Drive/Drive.json
+++ b/static/redfish/v1/JsonSchemas/Drive/Drive.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_11_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_12_0.json",
     "$ref": "#/definitions/Drive",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -119,6 +119,13 @@
                     ],
                     "units": "By"
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_12_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -156,6 +163,13 @@
                     "longDescription": "This property shall contain the encryption status for the associated drive.",
                     "readonly": true
                 },
+                "EnvironmentMetrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json#/definitions/EnvironmentMetrics",
+                    "description": "The link to the environment metrics for this drive.",
+                    "longDescription": "This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this drive.",
+                    "readonly": true,
+                    "versionAdded": "v1_12_0"
+                },
                 "FailurePredicted": {
                     "description": "An indication of whether this drive currently predicts a failure in the near future.",
                     "longDescription": "This property shall indicate whether this drive currently predicts a manufacturer-defined failure.",
@@ -253,6 +267,15 @@
                         "null"
                     ]
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_12_0"
+                },
                 "MediaType": {
                     "anyOf": [
                         {
@@ -762,6 +785,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Drive.v1_11_0.Drive"
+    "release": "2020.4",
+    "title": "#Drive.v1_12_0.Drive"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Endpoint/Endpoint.json b/static/redfish/v1/JsonSchemas/Endpoint/Endpoint.json
index 74dbbe9..422ec25 100644
--- a/static/redfish/v1/JsonSchemas/Endpoint/Endpoint.json
+++ b/static/redfish/v1/JsonSchemas/Endpoint/Endpoint.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Endpoint.v1_5_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Endpoint.v1_5_1.json",
     "$ref": "#/definitions/Endpoint",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -703,5 +703,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#Endpoint.v1_5_0.Endpoint"
+    "title": "#Endpoint.v1_5_1.Endpoint"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EndpointGroup/EndpointGroup.json b/static/redfish/v1/JsonSchemas/EndpointGroup/EndpointGroup.json
index 4809ef5..4c4397b 100644
--- a/static/redfish/v1/JsonSchemas/EndpointGroup/EndpointGroup.json
+++ b/static/redfish/v1/JsonSchemas/EndpointGroup/EndpointGroup.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EndpointGroup.v1_3_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EndpointGroup.v1_3_1.json",
     "$ref": "#/definitions/EndpointGroup",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -284,5 +284,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#EndpointGroup.v1_3_0.EndpointGroup"
+    "title": "#EndpointGroup.v1_3_1.EndpointGroup"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json b/static/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json
new file mode 100644
index 0000000..47f91d1
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json
@@ -0,0 +1,232 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.v1_0_0.json",
+    "$ref": "#/definitions/EnvironmentMetrics",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "#EnvironmentMetrics.ResetMetrics": {
+                    "$ref": "#/definitions/ResetMetrics"
+                },
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "EnvironmentMetrics": {
+            "additionalProperties": false,
+            "description": "The EnvironmentMetrics schema represents the environmental metrics of a device.",
+            "longDescription": "This resource shall represent the environmental metrics for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "EnergykWh": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorEnergykWhExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Energy consumption (kWh).",
+                    "excerptCopy": "SensorEnergykWhExcerpt",
+                    "longDescription": "This property shall contain the total energy, measured in kilowatt-hours (kW.h), for this resource.",
+                    "readonly": true
+                },
+                "FanSpeedsPercent": {
+                    "description": "Fan speeds (percent).",
+                    "excerptCopy": "SensorFanArrayExcerpt",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorFanArrayExcerpt"
+                    },
+                    "longDescription": "This property shall contain the fan speed readings for this resource.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "FanSpeedsPercent@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "HumidityPercent": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Humidity (percent).",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the humidity sensor reading for this resource.",
+                    "readonly": true
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "PowerWatts": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorPowerExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Power consumption (Watts).",
+                    "excerptCopy": "SensorPowerExcerpt",
+                    "longDescription": "This property shall contain the total power, measured in Watts, for this resource.",
+                    "readonly": true
+                },
+                "TemperatureCelsius": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Temperature (Celsius).",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the temperature sensor reading for this resource.",
+                    "readonly": true
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "ResetMetrics": {
+            "additionalProperties": false,
+            "description": "This action resets the summary metrics related to this equipment.",
+            "longDescription": "This action shall reset any time intervals or counted values for this equipment.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2020.4",
+    "title": "#EnvironmentMetrics.v1_0_0.EnvironmentMetrics"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EnvironmentMetrics/index.json b/static/redfish/v1/JsonSchemas/EnvironmentMetrics/index.json
new file mode 100644
index 0000000..3b105ed
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/EnvironmentMetrics/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+    "@odata.id": "/redfish/v1/JsonSchemas/EnvironmentMetrics",
+    "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+    "Name": "EnvironmentMetrics Schema File",
+    "Schema": "#EnvironmentMetrics.EnvironmentMetrics",
+    "Description": "EnvironmentMetrics Schema File Location",
+    "Id": "EnvironmentMetrics",
+    "Languages": [
+        "en"
+    ],
+    "Languages@odata.count": 1,
+    "Location": [
+        {
+            "Language": "en",
+            "PublicationUri": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json",
+            "Uri": "/redfish/v1/JsonSchemas/EnvironmentMetrics/EnvironmentMetrics.json"
+        }
+    ],
+    "Location@odata.count": 1
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json b/static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json
index 10f3448..d536b1d 100644
--- a/static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json
+++ b/static/redfish/v1/JsonSchemas/EthernetInterface/EthernetInterface.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EthernetInterface.v1_6_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EthernetInterface.v1_6_3.json",
     "$ref": "#/definitions/EthernetInterface",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -814,5 +814,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.1",
-    "title": "#EthernetInterface.v1_6_2.EthernetInterface"
+    "title": "#EthernetInterface.v1_6_3.EthernetInterface"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Event/Event.json b/static/redfish/v1/JsonSchemas/Event/Event.json
index bbd4105..cf299da 100644
--- a/static/redfish/v1/JsonSchemas/Event/Event.json
+++ b/static/redfish/v1/JsonSchemas/Event/Event.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Event.v1_6_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Event.v1_6_1.json",
     "$ref": "#/definitions/Event",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -155,7 +155,7 @@
                 },
                 "EventId": {
                     "description": "The unique instance identifier of an event.",
-                    "longDescription": "This property shall indicate a unique identifier for the event.  The value should be a string of a positive integer, and should be generated in a sequential manner.",
+                    "longDescription": "This property shall contain a service-defined unique identifier for the event.",
                     "readonly": true,
                     "type": "string"
                 },
@@ -196,21 +196,14 @@
                     "type": "array"
                 },
                 "MessageId": {
-                    "description": "The key used to find the message in a message registry.",
-                    "longDescription": "This property shall contain a MessageId, as defined in the Redfish Specification.",
+                    "description": "The identifier for the message.",
+                    "longDescription": "This property shall contain a MessageId, as defined in the 'MessageId format' clause of the Redfish Specification.",
                     "pattern": "^[A-Za-z0-9]+\\.\\d+\\.\\d+\\.[A-Za-z0-9.]+$",
                     "readonly": true,
                     "type": "string"
                 },
                 "MessageSeverity": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Health"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Health",
                     "description": "The severity of the message in this event.",
                     "longDescription": "This property shall contain the severity of the message in this event.  Services can replace the value defined in the message registry with a value more applicable to the implementation.",
                     "readonly": true,
@@ -230,7 +223,7 @@
                 "Severity": {
                     "deprecated": "This property has been deprecated in favor of MessageSeverity, which ties the values to the enumerations defined for the Health property within Status.",
                     "description": "The severity of the event.",
-                    "longDescription": "This property shall contain the severity of the event, as defined by the Redfish Specification.  Services can replace the value defined in the message registry with a value more applicable to the implementation.",
+                    "longDescription": "This property shall contain the severity of the event, as defined in the 'Status' clause of the Redfish Specification.  Services can replace the value defined in the message registry with a value more applicable to the implementation.",
                     "readonly": true,
                     "type": "string",
                     "versionDeprecated": "v1_5_0"
@@ -323,5 +316,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#Event.v1_6_0.Event"
+    "title": "#Event.v1_6_1.Event"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json b/static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json
index 992485c..a45d7f2 100644
--- a/static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json
+++ b/static/redfish/v1/JsonSchemas/EventDestination/EventDestination.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EventDestination.v1_9_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EventDestination.v1_10_0.json",
     "$ref": "#/definitions/EventDestination",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -39,13 +39,24 @@
             "enum": [
                 "TerminateAfterRetries",
                 "SuspendRetries",
-                "RetryForever"
+                "RetryForever",
+                "RetryForeverWithBackoff"
             ],
             "enumDescriptions": {
-                "RetryForever": "The subscription is not suspended or terminated, and attempts at delivery of future events shall continue even after the maximum number of retries is reached.",
+                "RetryForever": "The subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries.",
+                "RetryForeverWithBackoff": "The subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries, but issued over time according to a service-defined backoff algorithm.",
                 "SuspendRetries": "The subscription is suspended after the maximum number of retries is reached.",
                 "TerminateAfterRetries": "The subscription is terminated after the maximum number of retries is reached."
             },
+            "enumLongDescriptions": {
+                "RetryForever": "The subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries.  The interval between retries remains constant and is specified by the DeliveryRetryIntervalSeconds property in the event service.",
+                "RetryForeverWithBackoff": "The subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries.  Retry attempts are issued over time according to a service-defined backoff algorithm.  The backoff algorithm might insert an increasing amount of delay between retry attempts and might reach a maximum.",
+                "SuspendRetries": "The subscription is suspended after the maximum number of retries is reached, specified by the DeliveryRetryAttempts property in the event service.",
+                "TerminateAfterRetries": "The subscription is terminated after the maximum number of retries is reached, specified by the DeliveryRetryAttempts property in the event service."
+            },
+            "enumVersionAdded": {
+                "RetryForeverWithBackoff": "v1_10_0"
+            },
             "type": "string"
         },
         "EventDestination": {
@@ -110,8 +121,8 @@
                             "type": "null"
                         }
                     ],
-                    "description": "This property shall contain the subscription delivery retry policy for events, where the subscription type is RedfishEvent.",
-                    "longDescription": "This property shall indicate the subscription delivery retry policy for events where the subscription type is RedfishEvent.  If this property is not present, the policy shall be assumed to be TerminateAfterRetries.",
+                    "description": "The subscription delivery retry policy for events, where the subscription type is RedfishEvent.",
+                    "longDescription": "This property shall indicate the subscription delivery retry policy for events where the subscription type is RedfishEvent.",
                     "readonly": false,
                     "versionAdded": "v1_6_0"
                 },
@@ -378,6 +389,7 @@
             },
             "enumLongDescriptions": {
                 "OEM": "This value shall indicate an OEM specific protocol.  The OEMProtocol property shall contain the specific OEM event destination protocol.",
+                "Redfish": "This value shall indicate the destination follows the Redfish Specification for event notifications.  Destinations requesting EventFormatType of `Event` shall receive a Redfish resource of type Event.  Destinations requesting EventFormatType of `MetricReport` shall receive a Redfish resource of type MetricReport.",
                 "SMTP": "This value shall indicate the destination follows the RFC5321-defined SMTP specification.",
                 "SNMPv1": "This value shall indicate the destination follows the RFC1157-defined SNMPv1 protocol.",
                 "SNMPv2c": "This value shall indicate the destination follows the SNMPv2c protocol as defined by RFC1441 and RFC1452.",
@@ -482,20 +494,38 @@
                 "None",
                 "CommunityString",
                 "HMAC_MD5",
-                "HMAC_SHA96"
+                "HMAC_SHA96",
+                "HMAC128_SHA224",
+                "HMAC192_SHA256",
+                "HMAC256_SHA384",
+                "HMAC384_SHA512"
             ],
             "enumDescriptions": {
                 "CommunityString": "Trap community string authentication.",
+                "HMAC128_SHA224": "HMAC-128-SHA-224 authentication.",
+                "HMAC192_SHA256": "HMAC-192-SHA-256 authentication.",
+                "HMAC256_SHA384": "HMAC-256-SHA-384 authentication.",
+                "HMAC384_SHA512": "HMAC-384-SHA-512 authentication.",
                 "HMAC_MD5": "HMAC-MD5-96 authentication.",
                 "HMAC_SHA96": "HMAC-SHA-96 authentication.",
                 "None": "No authentication."
             },
             "enumLongDescriptions": {
                 "CommunityString": "This value shall indicate authentication using SNMP community strings and the value of TrapCommunity.",
+                "HMAC128_SHA224": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC128SHA224AuthProtocol.",
+                "HMAC192_SHA256": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC192SHA256AuthProtocol.",
+                "HMAC256_SHA384": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC256SHA384AuthProtocol.",
+                "HMAC384_SHA512": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC384SHA512AuthProtocol.",
                 "HMAC_MD5": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol.",
                 "HMAC_SHA96": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol.",
                 "None": "This value shall indicate authentication is not required."
             },
+            "enumVersionAdded": {
+                "HMAC128_SHA224": "v1_10_0",
+                "HMAC192_SHA256": "v1_10_0",
+                "HMAC256_SHA384": "v1_10_0",
+                "HMAC384_SHA512": "v1_10_0"
+            },
             "type": "string"
         },
         "SNMPEncryptionProtocols": {
@@ -537,8 +567,8 @@
             "properties": {
                 "AuthenticationKey": {
                     "description": "The secret authentication key for SNMPv3.",
-                    "longDescription": "This property shall contain the key used for SNMPv3 authentication.  The value shall be `null` in responses.",
-                    "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
+                    "pattern": "(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\\*+$)",
                     "readonly": false,
                     "type": [
                         "string",
@@ -546,6 +576,13 @@
                     ],
                     "versionAdded": "v1_7_0"
                 },
+                "AuthenticationKeySet": {
+                    "description": "Indicates if the AuthenticationKey property is set.",
+                    "longDescription": "This property shall contain `true` if a valid value was provided for the AuthenticationKey property.  Otherwise, the property shall contain `false`.",
+                    "readonly": true,
+                    "type": "boolean",
+                    "versionAdded": "v1_10_0"
+                },
                 "AuthenticationProtocol": {
                     "anyOf": [
                         {
@@ -562,7 +599,7 @@
                 },
                 "EncryptionKey": {
                     "description": "The secret authentication key for SNMPv3.",
-                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.",
+                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
                     "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
                     "readonly": false,
                     "type": [
@@ -571,6 +608,13 @@
                     ],
                     "versionAdded": "v1_7_0"
                 },
+                "EncryptionKeySet": {
+                    "description": "Indicates if the EncryptionKey property is set.",
+                    "longDescription": "This property shall contain `true` if a valid value was provided for the EncryptionKey property.  Otherwise, the property shall contain `false`.",
+                    "readonly": true,
+                    "type": "boolean",
+                    "versionAdded": "v1_10_0"
+                },
                 "EncryptionProtocol": {
                     "anyOf": [
                         {
@@ -768,6 +812,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#EventDestination.v1_9_0.EventDestination"
+    "release": "2020.4",
+    "title": "#EventDestination.v1_10_0.EventDestination"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EventService/EventService.json b/static/redfish/v1/JsonSchemas/EventService/EventService.json
index f14181a..16cb573 100644
--- a/static/redfish/v1/JsonSchemas/EventService/EventService.json
+++ b/static/redfish/v1/JsonSchemas/EventService/EventService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EventService.v1_7_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EventService.v1_7_1.json",
     "$ref": "#/definitions/EventService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -34,17 +34,6 @@
             },
             "type": "object"
         },
-        "EventFormatType": {
-            "enum": [
-                "Event",
-                "MetricReport"
-            ],
-            "enumDescriptions": {
-                "Event": "The subscription destination receives JSON bodies of type Event.",
-                "MetricReport": "The subscription destination receives JSON bodies of type MetricReport."
-            },
-            "type": "string"
-        },
         "EventService": {
             "additionalProperties": false,
             "description": "The EventService schema contains properties for managing event subscriptions and generates the events sent to subscribers.  The resource has links to the actual collection of subscriptions, which are called event destinations.",
@@ -217,8 +206,8 @@
                     "longDescription": "This property shall contain any status or health properties of the resource."
                 },
                 "SubordinateResourcesSupported": {
-                    "description": "An indication of whether the service supports the SubordinateResource property on both event subscriptions and generated events.",
-                    "longDescription": "This property shall indicate whether the service supports the SubordinateResource property on both event subscriptions and generated events.",
+                    "description": "An indication of whether the service supports the SubordinateResources property on both event subscriptions and generated events.",
+                    "longDescription": "This property shall indicate whether the service supports the SubordinateResources property on both event subscriptions and generated events.",
                     "readonly": true,
                     "type": [
                         "boolean",
@@ -595,5 +584,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.2",
-    "title": "#EventService.v1_7_0.EventService"
+    "title": "#EventService.v1_7_1.EventService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ExternalAccountProvider/ExternalAccountProvider.json b/static/redfish/v1/JsonSchemas/ExternalAccountProvider/ExternalAccountProvider.json
index e747a85..0cabeb7 100644
--- a/static/redfish/v1/JsonSchemas/ExternalAccountProvider/ExternalAccountProvider.json
+++ b/static/redfish/v1/JsonSchemas/ExternalAccountProvider/ExternalAccountProvider.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ExternalAccountProvider.v1_1_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ExternalAccountProvider.v1_2_0.json",
     "$ref": "#/definitions/ExternalAccountProvider",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -18,9 +18,9 @@
                 "RedfishService": "An external Redfish service."
             },
             "enumLongDescriptions": {
-                "ActiveDirectoryService": "The external account provider shall be a Microsoft Active Directory Technical Specification-comformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service.",
+                "ActiveDirectoryService": "The external account provider shall be a Microsoft Active Directory Technical Specification-conformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service.",
                 "LDAPService": "The external account provider shall be an RFC4511-conformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) that links to the set of LDAP servers for the service.",
-                "RedfishService": "The external account provider shall be a DMTF Redfish Specification-comformant service.  The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service."
+                "RedfishService": "The external account provider shall be a DMTF Redfish Specification-conformant service.  The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service."
             },
             "type": "string"
         },
@@ -83,6 +83,27 @@
                     "longDescription": "This property shall contain the type of authentication used to connect to the external account provider.",
                     "readonly": false
                 },
+                "EncryptionKey": {
+                    "description": "Specifies the encryption key.",
+                    "longDescription": "This property shall contain the value of a symmetric encryption key for account services that support some form of encryption, obfuscation, or authentication such as TACACS+.  The value shall be `null` in responses.  The property shall accept a hexadecimal string whose length depends on the external account service, such as TACACS+.  A TACACS+ service shall use this property to specify the secret key as defined in RFC8907.",
+                    "pattern": "^[0-9a-fA-F]+$",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                },
+                "EncryptionKeySet": {
+                    "description": "Indicates if the EncryptionKey property is set.",
+                    "longDescription": "This property shall contain `true` if a valid value was provided for the EncryptionKey property.  Otherwise, the property shall contain `false`.  For a TACACS+ service, the value `false` shall indicate data obfuscation, as defined in section 4.5 of RFC8907, is disabled.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                },
                 "KerberosKeytab": {
                     "description": "The Base64-encoded version of the Kerberos keytab for this service.  A PATCH or PUT operation writes the keytab.  This property is `null` in responses.",
                     "longDescription": "This property shall contain a Base64-encoded version of the Kerberos keytab for this service.  A PATCH or PUT operation writes the keytab.  The value shall be `null` in responses.",
@@ -234,6 +255,17 @@
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
+                "Priority": {
+                    "description": "The authentication priority for the external account provider.",
+                    "longDescription": "This property shall contain the assigned priority for the specified external account provider.  The value `0` value shall indicate the highest priority.  Increasing values shall represent decreasing priority.  If an external provider does not have a priority assignment or two or more external providers have the same priority, the behavior shall be determined by the Redfish service.  The priority is used to determine the order of authentication and authorization for each external account provider.",
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                },
                 "RemoteRoleMapping": {
                     "description": "The mapping rules to convert the external account providers account information to the local Redfish role.",
                     "items": {
@@ -269,6 +301,19 @@
                         "boolean",
                         "null"
                     ]
+                },
+                "TACACSplusService": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/TACACSplusService"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The additional information needed to parse a TACACS+ services.",
+                    "longDescription": "This property shall contain additional information needed to parse a TACACS+ services. This property should only be present inside a TACACSplus property.",
+                    "versionAdded": "v1_2_0"
                 }
             },
             "required": [
@@ -476,9 +521,82 @@
                 }
             },
             "type": "object"
+        },
+        "TACACSplusPasswordExchangeProtocol": {
+            "enum": [
+                "ASCII",
+                "PAP",
+                "CHAP",
+                "MSCHAPv1",
+                "MSCHAPv2"
+            ],
+            "enumDescriptions": {
+                "ASCII": "The ASCII Login method.",
+                "CHAP": "The CHAP Login method.",
+                "MSCHAPv1": "The MS-CHAP v1 Login method.",
+                "MSCHAPv2": "The MS-CHAP v2 Login method.",
+                "PAP": "The PAP Login method."
+            },
+            "enumLongDescriptions": {
+                "ASCII": "This value shall indicate the ASCII Login flow as described under section 5.4.2 of RFC8907.",
+                "CHAP": "This value shall indicate the CHAP Login flow as described under section 5.4.2 of RFC8907.",
+                "MSCHAPv1": "This value shall indicate the MS-CHAP v1 Login flow as described under section 5.4.2 of RFC8907.",
+                "MSCHAPv2": "This value shall indicate the MS-CHAP v2 Login flow as described under section 5.4.2 of RFC8907.",
+                "PAP": "This value shall indicate the PAP Login flow as described under section 5.4.2 of RFC8907."
+            },
+            "type": "string"
+        },
+        "TACACSplusService": {
+            "additionalProperties": false,
+            "description": "Various settings to parse a TACACS+ service.",
+            "longDescription": "This type shall contain settings for parsing a TACACS+ service.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "PasswordExchangeProtocols": {
+                    "description": "Indicates the allowed TACACS+ password exchange protocols.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/TACACSplusPasswordExchangeProtocol"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "This property shall indicate all the allowed TACACS+ password exchange protocol described under section 5.4.2 of RFC8907.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_2_0"
+                },
+                "PrivilegeLevelArgument": {
+                    "description": "Indicates the name of the TACACS+ argument name in an authorization request.",
+                    "longDescription": "This property shall specify the name of the argument in a TACACS+ Authorization REPLY packet body, as defined in RFC8907, that contains the user's privilege level.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                }
+            },
+            "type": "object"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2018.3",
-    "title": "#ExternalAccountProvider.v1_1_3.ExternalAccountProvider"
+    "release": "2020.4",
+    "title": "#ExternalAccountProvider.v1_2_0.ExternalAccountProvider"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Fabric/Fabric.json b/static/redfish/v1/JsonSchemas/Fabric/Fabric.json
index aaaa32c..edf7ed2 100644
--- a/static/redfish/v1/JsonSchemas/Fabric/Fabric.json
+++ b/static/redfish/v1/JsonSchemas/Fabric/Fabric.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Fabric.v1_2_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Fabric.v1_2_1.json",
     "$ref": "#/definitions/Fabric",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -222,5 +222,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#Fabric.v1_2_0.Fabric"
+    "title": "#Fabric.v1_2_1.Fabric"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Facility/Facility.json b/static/redfish/v1/JsonSchemas/Facility/Facility.json
index a147a1e..d237381 100644
--- a/static/redfish/v1/JsonSchemas/Facility/Facility.json
+++ b/static/redfish/v1/JsonSchemas/Facility/Facility.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Facility.v1_0_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Facility.v1_1_0.json",
     "$ref": "#/definitions/Facility",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -67,6 +67,13 @@
                     "description": "The available actions for this resource.",
                     "longDescription": "This property shall contain the available actions for this resource."
                 },
+                "AmbientMetrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json#/definitions/EnvironmentMetrics",
+                    "description": "The link to the ambient environment metrics for this facility.",
+                    "longDescription": "This property shall contain a link to a resource of type EnvironmentMetrics that specifies the outdoor environment metrics for this facility.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -78,6 +85,13 @@
                     ],
                     "readonly": true
                 },
+                "EnvironmentMetrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json#/definitions/EnvironmentMetrics",
+                    "description": "The link to the environment metrics for this facility.",
+                    "longDescription": "This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this facility.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "FacilityType": {
                     "$ref": "#/definitions/FacilityType",
                     "description": "The type of location this resource represents.",
@@ -283,6 +297,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.4",
-    "title": "#Facility.v1_0_1.Facility"
+    "release": "2020.4",
+    "title": "#Facility.v1_1_0.Facility"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Fan/Fan.json b/static/redfish/v1/JsonSchemas/Fan/Fan.json
new file mode 100644
index 0000000..04f9d82
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/Fan/Fan.json
@@ -0,0 +1,227 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/Fan.v1_0_0.json",
+    "$ref": "#/definitions/Fan",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "Fan": {
+            "additionalProperties": false,
+            "description": "The Fan schema describes a cooling fan unit for a computer system or similar devices contained within a chassis.",
+            "longDescription": "This resource shall represent the management properties for monitoring and management of cooling fans for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "Assembly": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Assembly.json#/definitions/Assembly",
+                    "description": "The link to the assembly associated with this fan.",
+                    "longDescription": "This property shall contain a link to a resource of type Assembly.",
+                    "readonly": true
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "HotPluggable": {
+                    "description": "An indication of whether this device can be inserted or removed while the equipment is in operation.",
+                    "longDescription": "This property shall indicate whether the device can be inserted or removed while the underlying equipment otherwise remains in its current operational state.  Hot-pluggable devices can become operable without altering the operational state of the underlying equipment.  Devices that cannot be inserted or removed from equipment in operation, or devices that cannot become operable without affecting the operational state of that equipment, shall be not hot-pluggable.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Location": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Location",
+                    "description": "The location of the fan.",
+                    "longDescription": "This property shall contain location information of this fan."
+                },
+                "LocationIndicatorActive": {
+                    "description": "An indicator allowing an operator to physically locate this resource.",
+                    "longDescription": "This property shall contain the state of the indicator used to physically identify or locate this resource.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
+                "Manufacturer": {
+                    "description": "The manufacturer of this fan.",
+                    "longDescription": "This property shall contain the name of the organization responsible for producing the fan.  This organization might be the entity from whom the fan is purchased, but this is not necessarily true.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Model": {
+                    "description": "The model number for this fan.",
+                    "longDescription": "This property shall contain the model information as defined by the manufacturer for this fan.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "PartNumber": {
+                    "description": "The part number for this fan.",
+                    "longDescription": "This property shall contain the part number as defined by the manufacturer for this fan.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "PhysicalContext": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext",
+                    "description": "The area or device associated with this fan.",
+                    "longDescription": "This property shall contain a description of the affected device or region within the chassis with which this fan is associated.",
+                    "readonly": true
+                },
+                "SerialNumber": {
+                    "description": "The serial number for this fan.",
+                    "longDescription": "This property shall contain the serial number as defined by the manufacturer for this fan.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "SparePartNumber": {
+                    "description": "The spare part number for this fan.",
+                    "longDescription": "This property shall contain the spare or replacement part number as defined by the manufacturer for this fan.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "SpeedPercent": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorFanExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The fan speed reading.",
+                    "excerptCopy": "SensorFanExcerpt",
+                    "longDescription": "This property shall contain the fan speed sensor.",
+                    "readonly": true
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource."
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2020.4",
+    "title": "#Fan.v1_0_0.Fan"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Fan/index.json b/static/redfish/v1/JsonSchemas/Fan/index.json
new file mode 100644
index 0000000..8a258f5
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/Fan/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+    "@odata.id": "/redfish/v1/JsonSchemas/Fan",
+    "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+    "Name": "Fan Schema File",
+    "Schema": "#Fan.Fan",
+    "Description": "Fan Schema File Location",
+    "Id": "Fan",
+    "Languages": [
+        "en"
+    ],
+    "Languages@odata.count": 1,
+    "Location": [
+        {
+            "Language": "en",
+            "PublicationUri": "http://redfish.dmtf.org/schemas/v1/Fan.json",
+            "Uri": "/redfish/v1/JsonSchemas/Fan/Fan.json"
+        }
+    ],
+    "Location@odata.count": 1
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Job/Job.json b/static/redfish/v1/JsonSchemas/Job/Job.json
index e9fa6b9..df7258c 100644
--- a/static/redfish/v1/JsonSchemas/Job/Job.json
+++ b/static/redfish/v1/JsonSchemas/Job/Job.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Job.v1_0_5.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Job.v1_0_6.json",
     "$ref": "#/definitions/Job",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -234,7 +234,7 @@
                 "Starting": "This value shall represent that the operation is starting.",
                 "Stopping": "This value shall represent that the operation is stopping but is not yet complete.",
                 "Suspended": "This value shall represent that the operation has been suspended but is expected to restart and is therefore not complete.",
-                "UserIntervention": "This value shall represent that the operation is waiting for a user to intervene and must be manually continued, stopped, or cancelled."
+                "UserIntervention": "This value shall represent that the operation is waiting for a user to intervene and needs to be manually continued, stopped, or cancelled."
             },
             "type": "string"
         },
@@ -312,5 +312,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.2",
-    "title": "#Job.v1_0_5.Job"
+    "title": "#Job.v1_0_6.Job"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/JobService/JobService.json b/static/redfish/v1/JsonSchemas/JobService/JobService.json
index aea3332..1dba5b4 100644
--- a/static/redfish/v1/JsonSchemas/JobService/JobService.json
+++ b/static/redfish/v1/JsonSchemas/JobService/JobService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/JobService.v1_0_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/JobService.v1_0_4.json",
     "$ref": "#/definitions/JobService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -214,5 +214,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.2",
-    "title": "#JobService.v1_0_3.JobService"
+    "title": "#JobService.v1_0_4.JobService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json b/static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json
index 3988fcf..fdf1101 100644
--- a/static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json
+++ b/static/redfish/v1/JsonSchemas/LogEntry/LogEntry.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_7_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_8_0.json",
     "$ref": "#/definitions/LogEntry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -337,6 +337,16 @@
                     ],
                     "versionAdded": "v1_3_0"
                 },
+                "Resolved": {
+                    "description": "Indicates if the cause of the log entry has been resolved or repaired.",
+                    "longDescription": "This property shall contain an indication if the cause of the log entry has been resolved or repaired.  The value `true` shall indicate if the cause of the log entry has been resolved or repaired.  This property shall contain the value `false` if the log entry is still active.  The value `false` shall be the initial state.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
                 "SensorNumber": {
                     "description": "The IPMI-defined sensor number.",
                     "longDescription": "This property shall contain the IPMI sensor number if the value of the EntryType property is `SEL`.  This property should not appear in the resource for other values of EntryType.",
@@ -649,6 +659,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#LogEntry.v1_7_0.LogEntry"
+    "release": "2020.4",
+    "title": "#LogEntry.v1_8_0.LogEntry"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Manager/Manager.json b/static/redfish/v1/JsonSchemas/Manager/Manager.json
index d3807d9..fbbb1f2 100644
--- a/static/redfish/v1/JsonSchemas/Manager/Manager.json
+++ b/static/redfish/v1/JsonSchemas/Manager/Manager.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_10_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_11_0.json",
     "$ref": "#/definitions/Manager",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -373,7 +373,7 @@
                 },
                 "DateTimeLocalOffset": {
                     "description": "The time offset from UTC that the DateTime property is in `+HH:MM` format.",
-                    "longDescription": "This property shall represent the offset from UTC time that the current DataTime property contains.",
+                    "longDescription": "This property shall represent the offset from UTC time that the current DateTime property contains.",
                     "pattern": "^([-+][0-1][0-9]:[0-5][0-9])$",
                     "readonly": false,
                     "type": [
@@ -400,7 +400,7 @@
                 },
                 "FirmwareVersion": {
                     "description": "The firmware version of this manager.",
-                    "longDescription": "This property shall contain the firwmare version as defined by the manufacturer for the associated manager.",
+                    "longDescription": "This property shall contain the firmware version as defined by the manufacturer for the associated manager.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -436,6 +436,22 @@
                     "description": "The links to other resources that are related to this resource.",
                     "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
                 },
+                "Location": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Location",
+                    "description": "The location of the manager.",
+                    "longDescription": "This property shall contain location information of the associated manager.",
+                    "versionAdded": "v1_11_0"
+                },
+                "LocationIndicatorActive": {
+                    "description": "An indicator allowing an operator to physically locate this resource.",
+                    "longDescription": "This property shall contain the state of the indicator used to physically identify or locate this resource.  A write to this property shall update the value of IndicatorLED in this resource, if supported, to reflect the implementation of the locating function.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_11_0"
+                },
                 "LogServices": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/LogServiceCollection.json#/definitions/LogServiceCollection",
                     "description": "The link to a collection of logs that the manager uses.",
@@ -572,6 +588,16 @@
                     "longDescription": "This property shall contain the UUID of the Redfish service that is hosted by this manager.  Each manager providing an entry point to the same Redfish service shall report the same UUID value, even though the name of the property might imply otherwise.  This property shall not be present if this manager does not provide a Redfish service entry point.",
                     "readonly": true
                 },
+                "SparePartNumber": {
+                    "description": "The spare part number of the manager.",
+                    "longDescription": "This property shall contain the spare part number of the manager.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_11_0"
+                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
@@ -892,6 +918,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Manager.v1_10_0.Manager"
+    "release": "2020.4",
+    "title": "#Manager.v1_11_0.Manager"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json b/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
index a1897af..ee31830 100644
--- a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
+++ b/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
@@ -1,22 +1,9 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_6_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_7_0.json",
     "$ref": "#/definitions/ManagerAccount",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
-        "AccountTypes": {
-            "enum": [
-                "Redfish",
-                "SNMP",
-                "OEM"
-            ],
-            "enumDescriptions": {
-                "OEM": "OEM account type.",
-                "Redfish": "Allow access to the Redfish service.",
-                "SNMP": "Allow access to SNMP services."
-            },
-            "type": "string"
-        },
         "Actions": {
             "additionalProperties": false,
             "description": "The available actions for this resource.",
@@ -114,14 +101,14 @@
                     "items": {
                         "anyOf": [
                             {
-                                "$ref": "#/definitions/AccountTypes"
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.json#/definitions/AccountTypes"
                             },
                             {
                                 "type": "null"
                             }
                         ]
                     },
-                    "longDescription": "This property shall contain an array of the various account types that apply to the account.  If this property is not provided by the client, the default value shall be an array with the single value `Redfish`.",
+                    "longDescription": "This property shall contain an array of the various account types that apply to the account.  If this property is not provided by the client, the default value shall be an array that contains the value `Redfish`.  The service might add additional values when this property is set or updated if allowed by the value of the StrictAccountTypes property.",
                     "readonly": false,
                     "type": "array",
                     "versionAdded": "v1_4_0"
@@ -242,6 +229,16 @@
                     "longDescription": "This property shall contain the SNMP settings for this account when AccountTypes contains `SNMP`.",
                     "versionAdded": "v1_4_0"
                 },
+                "StrictAccountTypes": {
+                    "description": "Indicates if the service needs to use the account types exactly as specified when the account is created or updated.",
+                    "longDescription": "This property shall indicate if the service needs to use the value of AccountTypes and OEMAccountTypes values exactly as specified.  A `true` value shall indicate the service needs to either accept the value without changes or reject the request.  A `false` value shall indicate the service might add additional `AccountTypes` and `OEMAccountTypes` values as needed to support limitations it has in separately controlling access to individual services.  If this property is not present, the value shall be assumed to be `false`.  An update of the service might cause account types to be added to or removed from the AccountTypes and OEMAccountTypes properties, regardless of the value of this property.  After a service update, clients should inspect all accounts where the value of this property is `true` and perform maintenance as needed.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_7_0"
+                },
                 "UserName": {
                     "description": "The user name for the account.",
                     "longDescription": "This property shall contain the user name for this account.",
@@ -288,18 +285,36 @@
             "enum": [
                 "None",
                 "HMAC_MD5",
-                "HMAC_SHA96"
+                "HMAC_SHA96",
+                "HMAC128_SHA224",
+                "HMAC192_SHA256",
+                "HMAC256_SHA384",
+                "HMAC384_SHA512"
             ],
             "enumDescriptions": {
+                "HMAC128_SHA224": "HMAC-128-SHA-224 authentication.",
+                "HMAC192_SHA256": "HMAC-192-SHA-256 authentication.",
+                "HMAC256_SHA384": "HMAC-256-SHA-384 authentication.",
+                "HMAC384_SHA512": "HMAC-384-SHA-512 authentication.",
                 "HMAC_MD5": "HMAC-MD5-96 authentication.",
                 "HMAC_SHA96": "HMAC-SHA-96 authentication.",
                 "None": "No authentication."
             },
             "enumLongDescriptions": {
+                "HMAC128_SHA224": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC128SHA224AuthProtocol.",
+                "HMAC192_SHA256": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC192SHA256AuthProtocol.",
+                "HMAC256_SHA384": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC256SHA384AuthProtocol.",
+                "HMAC384_SHA512": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC384SHA512AuthProtocol.",
                 "HMAC_MD5": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol.",
                 "HMAC_SHA96": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol.",
                 "None": "This value shall indicate authentication is not required."
             },
+            "enumVersionAdded": {
+                "HMAC128_SHA224": "v1_7_0",
+                "HMAC192_SHA256": "v1_7_0",
+                "HMAC256_SHA384": "v1_7_0",
+                "HMAC384_SHA512": "v1_7_0"
+            },
             "type": "string"
         },
         "SNMPEncryptionProtocols": {
@@ -342,7 +357,7 @@
                 "AuthenticationKey": {
                     "description": "The secret authentication key for SNMPv3.",
                     "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark.",
-                    "pattern": "(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24})|(^\\*+$)",
+                    "pattern": "(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\\*+$)",
                     "readonly": false,
                     "type": [
                         "string",
@@ -408,6 +423,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.1",
-    "title": "#ManagerAccount.v1_6_2.ManagerAccount"
+    "release": "2020.4",
+    "title": "#ManagerAccount.v1_7_0.ManagerAccount"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json b/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
index d28c54e..d9ef24d 100644
--- a/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
+++ b/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerNetworkProtocol.v1_6_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerNetworkProtocol.v1_7_0.json",
     "$ref": "#/definitions/ManagerNetworkProtocol",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -292,7 +292,7 @@
                 "VirtualMedia": {
                     "$ref": "#/definitions/Protocol",
                     "description": "The settings for this manager's virtual media support that apply to all system instances controlled by this manager.",
-                    "longDescription": "This object shall contain the virtual media protocol settings for this manager.  The Port property shall contain the TCP port assigned for Virtual Media usage.  If multiple systems are supported by this manager, these properites, if present, apply to all instances of virtual media controlled by this manager."
+                    "longDescription": "This object shall contain the virtual media protocol settings for this manager.  The Port property shall contain the TCP port assigned for Virtual Media usage.  If multiple systems are supported by this manager, these properties, if present, apply to all instances of virtual media controlled by this manager."
                 }
             },
             "required": [
@@ -437,20 +437,38 @@
                 "Account",
                 "CommunityString",
                 "HMAC_MD5",
-                "HMAC_SHA96"
+                "HMAC_SHA96",
+                "HMAC128_SHA224",
+                "HMAC192_SHA256",
+                "HMAC256_SHA384",
+                "HMAC384_SHA512"
             ],
             "enumDescriptions": {
                 "Account": "Authentication is determined by account settings.",
                 "CommunityString": "SNMP community string authentication.",
+                "HMAC128_SHA224": "HMAC-128-SHA-224 authentication.",
+                "HMAC192_SHA256": "HMAC-192-SHA-256 authentication.",
+                "HMAC256_SHA384": "HMAC-256-SHA-384 authentication.",
+                "HMAC384_SHA512": "HMAC-384-SHA-512 authentication.",
                 "HMAC_MD5": "HMAC-MD5-96 authentication.",
                 "HMAC_SHA96": "HMAC-SHA-96 authentication."
             },
             "enumLongDescriptions": {
                 "Account": "This value shall indicate authentication for SNMPv3 access is determined based on the corresponding account settings.",
                 "CommunityString": "This value shall indicate authentication uses SNMP community strings.",
+                "HMAC128_SHA224": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC128SHA224AuthProtocol.",
+                "HMAC192_SHA256": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC192SHA256AuthProtocol.",
+                "HMAC256_SHA384": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC256SHA384AuthProtocol.",
+                "HMAC384_SHA512": "This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC384SHA512AuthProtocol.",
                 "HMAC_MD5": "This value shall indicate authentication for SNMPv3 access conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol.",
                 "HMAC_SHA96": "This value shall indicate authentication for SNMPv3 access conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."
             },
+            "enumVersionAdded": {
+                "HMAC128_SHA224": "v1_7_0",
+                "HMAC192_SHA256": "v1_7_0",
+                "HMAC256_SHA384": "v1_7_0",
+                "HMAC384_SHA512": "v1_7_0"
+            },
             "type": "string"
         },
         "SNMPCommunity": {
@@ -774,6 +792,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.1",
-    "title": "#ManagerNetworkProtocol.v1_6_1.ManagerNetworkProtocol"
+    "release": "2020.4",
+    "title": "#ManagerNetworkProtocol.v1_7_0.ManagerNetworkProtocol"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Memory/Memory.json b/static/redfish/v1/JsonSchemas/Memory/Memory.json
index 6883a72..fda138f 100644
--- a/static/redfish/v1/JsonSchemas/Memory/Memory.json
+++ b/static/redfish/v1/JsonSchemas/Memory/Memory.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Memory.v1_10_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Memory.v1_11_0.json",
     "$ref": "#/definitions/Memory",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -84,7 +84,7 @@
         "DisablePassphrase": {
             "additionalProperties": false,
             "description": "Disable passphrase for given regions.",
-            "longDescription": "This action shall disaple the need for passphrases on the supplied region provided the supplied passphrase matches that of the region.",
+            "longDescription": "This action shall disable the need for passphrases on the supplied region provided the supplied passphrase matches that of the region.",
             "parameters": {
                 "Passphrase": {
                     "description": "Passphrase for doing the operation.",
@@ -171,6 +171,19 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
                     "description": "The OEM extension property.",
                     "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
+                "Processors": {
+                    "description": "An array of links to the processors associated with this memory device.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Processor.json#/definitions/Processor"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type Processor that are associated with this memory device.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_11_0"
+                },
+                "Processors@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 }
             },
             "type": "object"
@@ -293,6 +306,13 @@
                     ],
                     "units": "MiBy"
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_11_0"
+                },
                 "ConfigurationLocked": {
                     "description": "An indication of whether the configuration of this memory device is locked and cannot be altered.",
                     "longDescription": "This property shall indicate whether the configuration of this memory device is locked and cannot be altered.",
@@ -345,6 +365,13 @@
                     ],
                     "versionDeprecated": "v1_9_0"
                 },
+                "EnvironmentMetrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json#/definitions/EnvironmentMetrics",
+                    "description": "The link to the environment metrics for this memory.",
+                    "longDescription": "This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this memory.",
+                    "readonly": true,
+                    "versionAdded": "v1_11_0"
+                },
                 "ErrorCorrection": {
                     "anyOf": [
                         {
@@ -461,6 +488,15 @@
                     "type": "array",
                     "units": "mW"
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_11_0"
+                },
                 "MemoryDeviceType": {
                     "anyOf": [
                         {
@@ -529,6 +565,16 @@
                     "longDescription": "The link to the metrics associated with this memory device.",
                     "readonly": true
                 },
+                "Model": {
+                    "description": "The product model number of this device.",
+                    "longDescription": "This property shall indicate the model information as provided by the manufacturer of this memory.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_11_0"
+                },
                 "ModuleManufacturerID": {
                     "description": "The manufacturer ID of this memory device.",
                     "longDescription": "This property shall contain the two byte manufacturer ID of this memory device as defined by JEDEC in JEP-106.",
@@ -689,6 +735,16 @@
                         "null"
                     ]
                 },
+                "SparePartNumber": {
+                    "description": "The spare part number of the memory.",
+                    "longDescription": "This property shall contain the spare part number of the memory.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_11_0"
+                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
@@ -815,7 +871,17 @@
                 "PipelinedNibble",
                 "Logical",
                 "HBM",
-                "HBM2"
+                "HBM2",
+                "HBM3",
+                "GDDR",
+                "GDDR2",
+                "GDDR3",
+                "GDDR4",
+                "GDDR5",
+                "GDDR5X",
+                "GDDR6",
+                "DDR5",
+                "OEM"
             ],
             "enumDescriptions": {
                 "DDR": "DDR.",
@@ -828,23 +894,43 @@
                 "DDR4": "DDR4.",
                 "DDR4E_SDRAM": "DDR4E SDRAM.",
                 "DDR4_SDRAM": "DDR4 SDRAM.",
+                "DDR5": "Double data rate type five synchronous dynamic random-access memory.",
                 "DDR_SDRAM": "DDR SDRAM.",
                 "DDR_SGRAM": "DDR SGRAM.",
                 "EDO": "EDO.",
                 "FastPageMode": "Fast Page Mode.",
+                "GDDR": "Synchronous graphics random-access memory.",
+                "GDDR2": "Double data rate type two synchronous graphics random-access memory.",
+                "GDDR3": "Double data rate type three synchronous graphics random-access memory.",
+                "GDDR4": "Double data rate type four synchronous graphics random-access memory.",
+                "GDDR5": "Double data rate type five synchronous graphics random-access memory.",
+                "GDDR5X": "Double data rate type five X synchronous graphics random-access memory.",
+                "GDDR6": "Double data rate type six synchronous graphics random-access memory.",
                 "HBM": "High Bandwidth Memory.",
-                "HBM2": "High Bandwidth Memory 2.",
+                "HBM2": "The second generation of High Bandwidth Memory.",
+                "HBM3": "The third generation of High Bandwidth Memory.",
                 "LPDDR3_SDRAM": "LPDDR3 SDRAM.",
                 "LPDDR4_SDRAM": "LPDDR4 SDRAM.",
                 "Logical": "Logical Non-volatile device.",
+                "OEM": "OEM-defined.",
                 "PipelinedNibble": "Pipelined Nibble.",
                 "ROM": "ROM.",
                 "SDRAM": "SDRAM."
             },
             "enumVersionAdded": {
+                "DDR5": "v1_11_0",
+                "GDDR": "v1_11_0",
+                "GDDR2": "v1_11_0",
+                "GDDR3": "v1_11_0",
+                "GDDR4": "v1_11_0",
+                "GDDR5": "v1_11_0",
+                "GDDR5X": "v1_11_0",
+                "GDDR6": "v1_11_0",
                 "HBM": "v1_7_0",
                 "HBM2": "v1_7_0",
-                "Logical": "v1_4_0"
+                "HBM3": "v1_11_0",
+                "Logical": "v1_4_0",
+                "OEM": "v1_11_0"
             },
             "type": "string"
         },
@@ -934,14 +1020,14 @@
             ],
             "enumDescriptions": {
                 "DRAM": "The memory device is comprised of volatile memory.",
-                "IntelOptane": "The memory device is an Intel Optane DC Persistent Memory Module.",
+                "IntelOptane": "The memory device is an Intel Optane Persistent Memory Module.",
                 "NVDIMM_F": "The memory device is comprised of non-volatile memory.",
                 "NVDIMM_N": "The memory device is comprised of volatile memory backed by non-volatile memory.",
                 "NVDIMM_P": "The memory device is comprised of a combination of non-volatile and volatile memory."
             },
             "enumLongDescriptions": {
                 "DRAM": "This value shall represent a volatile DRAM memory device.",
-                "IntelOptane": "This value shall represent an Intel Optane DC Persistent Memory Module.",
+                "IntelOptane": "This value shall represent an Intel Optane Persistent Memory Module.",
                 "NVDIMM_F": "This value shall represent an NVDIMM_F memory device as defined by JEDEC.",
                 "NVDIMM_N": "This value shall represent an NVDIMM_N memory device as defined by JEDEC.",
                 "NVDIMM_P": "This value shall represent an NVDIMM_P memory device as defined by JEDEC."
@@ -1421,7 +1507,7 @@
             "parameters": {
                 "Passphrase": {
                     "description": "The passphrase required to complete the operation.",
-                    "longDescription": "This property shall contain the passphrase required to complete this actionn.",
+                    "longDescription": "This property shall contain the passphrase required to complete this action.",
                     "requiredParameter": true,
                     "type": "string"
                 },
@@ -1461,6 +1547,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Memory.v1_10_0.Memory"
+    "release": "2020.4",
+    "title": "#Memory.v1_11_0.Memory"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MemoryChunks/MemoryChunks.json b/static/redfish/v1/JsonSchemas/MemoryChunks/MemoryChunks.json
index d00cd02..6ff01b2 100644
--- a/static/redfish/v1/JsonSchemas/MemoryChunks/MemoryChunks.json
+++ b/static/redfish/v1/JsonSchemas/MemoryChunks/MemoryChunks.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MemoryChunks.v1_4_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MemoryChunks.v1_4_1.json",
     "$ref": "#/definitions/MemoryChunks",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -327,5 +327,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#MemoryChunks.v1_4_0.MemoryChunks"
+    "title": "#MemoryChunks.v1_4_1.MemoryChunks"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json b/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json
index eee200a..a841f07 100644
--- a/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json
+++ b/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MemoryMetrics.v1_4_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MemoryMetrics.v1_4_1.json",
     "$ref": "#/definitions/MemoryMetrics",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -378,7 +378,7 @@
                 },
                 "BlockSizeBytes": {
                     "description": "The block size, in bytes.",
-                    "longDescription": "This property shall contain the block size, in bytes, of all stucture elements.  When this resource is subordinate to the MemorySummary object, this property is not applicable.",
+                    "longDescription": "This property shall contain the block size, in bytes, of all structure elements.  When this resource is subordinate to the MemorySummary object, this property is not applicable.",
                     "readonly": true,
                     "type": [
                         "integer",
@@ -469,5 +469,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#MemoryMetrics.v1_4_0.MemoryMetrics"
+    "title": "#MemoryMetrics.v1_4_1.MemoryMetrics"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Message/Message.json b/static/redfish/v1/JsonSchemas/Message/Message.json
index 803e0b1..9137975 100644
--- a/static/redfish/v1/JsonSchemas/Message/Message.json
+++ b/static/redfish/v1/JsonSchemas/Message/Message.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Message.v1_1_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Message.v1_1_2.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -23,38 +23,28 @@
             },
             "properties": {
                 "Message": {
-                    "description": "The human-readable message, if provided.",
-                    "longDescription": "This property shall contain an optional human-readable message.",
+                    "description": "The human-readable message.",
+                    "longDescription": "This property shall contain a human-readable message.",
                     "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
+                    "type": "string"
                 },
                 "MessageArgs": {
-                    "description": "This array of message arguments are substituted for the arguments in the message when looked up in the message registry.",
+                    "description": "An array of message arguments that are substituted for the arguments in the message when looked up in the message registry.",
                     "items": {
                         "type": "string"
                     },
-                    "longDescription": "This property shall contain the message substitution arguments for the specific message to which this MessageId refers and shall be included only if the MessageId is present.  Any number and integer type arguments shall be converted to strings.",
+                    "longDescription": "This property shall contain an array of message arguments that are substituted for the arguments in the message when looked up in the message registry.  It has the same semantics as the MessageArgs property in the Redfish MessageRegistry schema.",
                     "readonly": true,
                     "type": "array"
                 },
                 "MessageId": {
-                    "description": "The key for this message used to find the message in a message registry.",
-                    "longDescription": "This property shall contain a key into message registry, as described in the Redfish Specification.",
+                    "description": "The identifier for the message.",
+                    "longDescription": "This property shall contain a MessageId, as defined in the 'MessageId format' clause of the Redfish Specification.",
                     "readonly": true,
                     "type": "string"
                 },
                 "MessageSeverity": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Health"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Health",
                     "description": "The severity of the message.",
                     "longDescription": "This property shall contain the severity of the message.  Services can replace the value defined in the message registry with a value more applicable to the implementation.",
                     "readonly": true,
@@ -75,23 +65,17 @@
                     "type": "array"
                 },
                 "Resolution": {
-                    "description": "Used to provide suggestions on how to resolve the situation that caused the error.",
+                    "description": "Used to provide suggestions on how to resolve the situation that caused the message.",
                     "longDescription": "This property shall contain the resolution of the message.  Services can replace the resolution defined in the message registry with a more specific resolution in message payloads.",
                     "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ]
+                    "type": "string"
                 },
                 "Severity": {
                     "deprecated": "This property has been deprecated in favor of MessageSeverity, which ties the values to the enumerations defined for the Health property within Status.",
-                    "description": "The severity of the errors.",
-                    "longDescription": "This property shall contain the severity of the error, as defined in the Status section of the Redfish Specification.  Services can replace the value defined in the message registry with a value more applicable to the implementation.",
+                    "description": "The severity of the message.",
+                    "longDescription": "This property shall contain the severity of the message, as defined in the 'Status' clause of the Redfish Specification.  Services can replace the value defined in the message registry with a value more applicable to the implementation.",
                     "readonly": true,
-                    "type": [
-                        "string",
-                        "null"
-                    ],
+                    "type": "string",
                     "versionDeprecated": "v1_1_0"
                 }
             },
@@ -103,5 +87,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.1",
-    "title": "#Message.v1_1_1"
+    "title": "#Message.v1_1_2"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json b/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json
index bbce11e..6dd58cd 100644
--- a/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json
+++ b/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MessageRegistry.v1_4_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MessageRegistry.v1_4_2.json",
     "$ref": "#/definitions/MessageRegistry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -184,7 +184,7 @@
                         }
                     ],
                     "description": "The severity of the message.",
-                    "longDescription": "This property shall contain the severity of the message.",
+                    "longDescription": "This property shall contain the severity of the message.  Services can replace the severity defined in the message registry with a value more applicable to the implementation in message payloads and event payloads.",
                     "readonly": true,
                     "versionAdded": "v1_4_0"
                 },
@@ -218,7 +218,7 @@
                 "Severity": {
                     "deprecated": "This property has been deprecated in favor of MessageSeverity, which ties the values to the enumerations defined for the Health property within Status.",
                     "description": "The severity of the message.",
-                    "longDescription": "This property shall contain the severity of the condition resulting in the message, as defined in the Status clause of the Redfish Specification.",
+                    "longDescription": "This property shall contain the severity of the condition resulting in the message, as defined in the 'Status' clause of the Redfish Specification.  Services can replace the severity defined in the message registry with a value more applicable to the implementation in message payloads and event payloads.",
                     "readonly": true,
                     "type": "string",
                     "versionDeprecated": "v1_4_0"
@@ -388,5 +388,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.1",
-    "title": "#MessageRegistry.v1_4_1.MessageRegistry"
+    "title": "#MessageRegistry.v1_4_2.MessageRegistry"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json b/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
index e02f550..14bb96a 100644
--- a/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
+++ b/static/redfish/v1/JsonSchemas/MetricDefinition/MetricDefinition.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MetricDefinition.v1_1_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MetricDefinition.v1_1_1.json",
     "$ref": "#/definitions/MetricDefinition",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -91,7 +91,7 @@
             "properties": {
                 "ResultMetric": {
                     "description": "The link to a metric property that stores the result of the calculation.  If the link has wildcards, the wildcards are substituted as specified in the Wildcards array property.",
-                    "longDescription": "This property shall contain a link to a metric property that stores the result of the calcuation.  A set of curly braces shall delimit each wildcard in the URI.  The corresponding entry in the Wildcard property shall replace each wildcard.  After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies.  The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules.",
+                    "longDescription": "This property shall contain a link to a metric property that stores the result of the calculation.  A set of curly braces shall delimit each wildcard in the URI.  The corresponding entry in the Wildcard property shall replace each wildcard.  After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies.  The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -100,7 +100,7 @@
                 },
                 "SourceMetric": {
                     "description": "The metric property used as the input into the calculation.  If the link has wildcards, the wildcards are substituted as specified in the Wildcards array property.",
-                    "longDescription": "This property shall contain a link to a metric property used in a calcuation.  A set of curly braces shall delimit each wildcard in the URI.  The corresponding entry in the Wildcard property shall replace each wildcard.  After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies.  The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules.",
+                    "longDescription": "This property shall contain a link to a metric property used in a calculation.  A set of curly braces shall delimit each wildcard in the URI.  The corresponding entry in the Wildcard property shall replace each wildcard.  After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies.  The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -270,7 +270,7 @@
                             "null"
                         ]
                     },
-                    "longDescription": "The values of the property shall specify the possible values of the discrete metic.  This property shall have values when the MetricType property is `Discrete`.",
+                    "longDescription": "The values of the property shall specify the possible values of the discrete metric.  This property shall have values when the MetricType property is `Discrete`.",
                     "readonly": false,
                     "type": "array"
                 },
@@ -533,5 +533,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#MetricDefinition.v1_1_0.MetricDefinition"
+    "title": "#MetricDefinition.v1_1_1.MetricDefinition"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json b/static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json
index bf50579..4df19e7 100644
--- a/static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json
+++ b/static/redfish/v1/JsonSchemas/MetricReport/MetricReport.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MetricReport.v1_4_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MetricReport.v1_4_1.json",
     "$ref": "#/definitions/MetricReport",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -33,8 +33,8 @@
         },
         "MetricReport": {
             "additionalProperties": false,
-            "description": "The metric definitions that create a metric report.",
-            "longDescription": "The definition for this metric report.",
+            "description": "The MetricReport schema represents a set of collected metrics.",
+            "longDescription": "This resource shall represent a metric report in a Redfish implementation.  When a metric report is deleted, the historic metric data used to generate the report shall be deleted as well unless other metric reports are consuming the data.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -236,5 +236,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.2",
-    "title": "#MetricReport.v1_4_0.MetricReport"
+    "title": "#MetricReport.v1_4_1.MetricReport"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json b/static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json
index 4734b87..297d390 100644
--- a/static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json
+++ b/static/redfish/v1/JsonSchemas/MetricReportDefinition/MetricReportDefinition.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MetricReportDefinition.v1_3_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MetricReportDefinition.v1_4_0.json",
     "$ref": "#/definitions/MetricReportDefinition",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -170,7 +170,7 @@
                     "readonly": false
                 },
                 "MetricId": {
-                    "description": "The label for the metric definition that is derived by applying the collectionFunction to the metric property.  It matches the Id property of the corresponding metric definition.",
+                    "description": "The label for the metric definition that is derived by applying the CollectionFunction to the metric property.  It matches the Id property of the corresponding metric definition.",
                     "longDescription": "This property shall specify the label for the metric definition that is derived by applying the algorithm specified in the CollectionFunction property to the metric property.  This property shall match the Id property of the corresponding metric definition.",
                     "readonly": false,
                     "type": [
@@ -190,6 +190,12 @@
                     "longDescription": "Each value can contain one or more wildcard names enclosed in curly braces.  Wildcard value entries shall be substituted for each Wildcard name found.  If two or more wild names are found, the same wildcard index is used for each in one substitution pass.  After substituting the wildcard values entries, each value shall contain a URI for a property in a resource that matches a property declaration in the corresponding metric definition.",
                     "readonly": false,
                     "type": "array"
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements.",
+                    "versionAdded": "v1_4_0"
                 }
             },
             "type": "object"
@@ -527,6 +533,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.2",
-    "title": "#MetricReportDefinition.v1_3_3.MetricReportDefinition"
+    "release": "2020.4",
+    "title": "#MetricReportDefinition.v1_4_0.MetricReportDefinition"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/NetworkAdapter/NetworkAdapter.json b/static/redfish/v1/JsonSchemas/NetworkAdapter/NetworkAdapter.json
index 645a01c..6c7ef0d 100644
--- a/static/redfish/v1/JsonSchemas/NetworkAdapter/NetworkAdapter.json
+++ b/static/redfish/v1/JsonSchemas/NetworkAdapter/NetworkAdapter.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkAdapter.v1_5_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkAdapter.v1_6_0.json",
     "$ref": "#/definitions/NetworkAdapter",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -349,6 +349,13 @@
                     "readonly": true,
                     "versionAdded": "v1_1_0"
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_6_0"
+                },
                 "Controllers": {
                     "description": "The set of network controllers ASICs that make up this NetworkAdapter.",
                     "items": {
@@ -396,6 +403,15 @@
                         "null"
                     ]
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_6_0"
+                },
                 "Model": {
                     "description": "The model string for this network adapter.",
                     "longDescription": "This property shall contain the information about how the manufacturer refers to this network adapter.",
@@ -685,6 +701,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#NetworkAdapter.v1_5_0.NetworkAdapter"
+    "release": "2020.4",
+    "title": "#NetworkAdapter.v1_6_0.NetworkAdapter"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/NetworkDeviceFunction/NetworkDeviceFunction.json b/static/redfish/v1/JsonSchemas/NetworkDeviceFunction/NetworkDeviceFunction.json
index b12da4a..99f414c 100644
--- a/static/redfish/v1/JsonSchemas/NetworkDeviceFunction/NetworkDeviceFunction.json
+++ b/static/redfish/v1/JsonSchemas/NetworkDeviceFunction/NetworkDeviceFunction.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkDeviceFunction.v1_5_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkDeviceFunction.v1_5_1.json",
     "$ref": "#/definitions/NetworkDeviceFunction",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -55,10 +55,10 @@
             ],
             "enumDescriptions": {
                 "Disabled": "Do not indicate to UEFI/BIOS that this device is bootable.",
-                "FibreChannel": "Boot this device by using the embedded Fibre Channel support and configuration.  Only applicable if the NetworkDeviceFunctionType is `FibreChannel`.",
-                "FibreChannelOverEthernet": "Boot this device by using the embedded Fibre Channel over Ethernet (FCoE) boot support and configuration.  Only applicable if the NetworkDeviceFunctionType is `FibreChannelOverEthernet`.",
-                "PXE": "Boot this device by using the embedded PXE support.  Only applicable if the NetworkDeviceFunctionType is `Ethernet` or `InfiniBand`.",
-                "iSCSI": "Boot this device by using the embedded iSCSI boot support and configuration.  Only applicable if the NetworkDeviceFunctionType is `iSCSI`."
+                "FibreChannel": "Boot this device by using the embedded Fibre Channel support and configuration.  Only applicable if the NetDevFuncType is `FibreChannel`.",
+                "FibreChannelOverEthernet": "Boot this device by using the embedded Fibre Channel over Ethernet (FCoE) boot support and configuration.  Only applicable if the NetDevFuncType is `FibreChannelOverEthernet`.",
+                "PXE": "Boot this device by using the embedded PXE support.  Only applicable if the NetDevFuncType is `Ethernet` or `InfiniBand`.",
+                "iSCSI": "Boot this device by using the embedded iSCSI boot support and configuration.  Only applicable if the NetDevFuncType is `iSCSI` or `Ethernet`."
             },
             "type": "string"
         },
@@ -325,8 +325,8 @@
         },
         "InfiniBand": {
             "additionalProperties": false,
-            "description": "This type describes InifiniBand capabilities, status, and configuration of a network device function.",
-            "longDescription": "This type shall describe the InifiniBand capabilities, status, and configuration values for a network device function.",
+            "description": "This type describes InfiniBand capabilities, status, and configuration of a network device function.",
+            "longDescription": "This type shall describe the InfiniBand capabilities, status, and configuration values for a network device function.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -472,6 +472,11 @@
                     "longDescription": "This property shall contain a link to a resource of type EthernetInterface that represents a virtual interface that was created when one of the network device function VLANs is represented as a virtual NIC for the purpose of showing the IP address associated with that VLAN.  The EthernetInterfaceType property of that resource shall contain the value `Virtual`.",
                     "versionAdded": "v1_4_0"
                 },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
                 "PCIeFunction": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/PCIeFunction.json#/definitions/PCIeFunction",
                     "description": "The link to the PCIe function associated with this network device function.",
@@ -546,7 +551,7 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "AssignablePhysicalPorts": {
-                    "deprecated": "This property has been deprecated in favor of the AssignablePhysicalNetowrkPorts property.",
+                    "deprecated": "This property has been deprecated in favor of the AssignablePhysicalNetworkPorts property.",
                     "description": "An array of physical ports to which this network device function can be assigned.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/NetworkPort.json#/definitions/NetworkPort"
@@ -804,7 +809,7 @@
                 },
                 "CHAPUsername": {
                     "description": "The user name for CHAP authentication.",
-                    "longDescription": "This property shall containhe user name for CHAP authentication.",
+                    "longDescription": "This property shall contain the user name for CHAP authentication.",
                     "readonly": false,
                     "type": [
                         "string",
@@ -1041,5 +1046,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#NetworkDeviceFunction.v1_5_0.NetworkDeviceFunction"
+    "title": "#NetworkDeviceFunction.v1_5_1.NetworkDeviceFunction"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/NetworkInterface/NetworkInterface.json b/static/redfish/v1/JsonSchemas/NetworkInterface/NetworkInterface.json
index adcc24c..5dc1541 100644
--- a/static/redfish/v1/JsonSchemas/NetworkInterface/NetworkInterface.json
+++ b/static/redfish/v1/JsonSchemas/NetworkInterface/NetworkInterface.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkInterface.v1_2_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkInterface.v1_2_1.json",
     "$ref": "#/definitions/NetworkInterface",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -68,7 +68,7 @@
         "NetworkInterface": {
             "additionalProperties": false,
             "description": "The NetworkInterface schema describes links to the network adapters, network ports, and network device functions, and represents the functionality available to the containing system.",
-            "longDescription": "This resource contains links to the network adapters, network porta, and network device functions, and represents the functionality available to the containing system.",
+            "longDescription": "This resource contains links to the network adapters, network ports, and network device functions, and represents the functionality available to the containing system.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
                     "description": "This property shall specify a valid odata or Redfish property.",
@@ -190,5 +190,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#NetworkInterface.v1_2_0.NetworkInterface"
+    "title": "#NetworkInterface.v1_2_1.NetworkInterface"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/NetworkPort/NetworkPort.json b/static/redfish/v1/JsonSchemas/NetworkPort/NetworkPort.json
index 3129b02..9c75895 100644
--- a/static/redfish/v1/JsonSchemas/NetworkPort/NetworkPort.json
+++ b/static/redfish/v1/JsonSchemas/NetworkPort/NetworkPort.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkPort.v1_3_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/NetworkPort.v1_4_0.json",
     "$ref": "#/definitions/NetworkPort",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -157,6 +157,7 @@
         },
         "NetworkPort": {
             "additionalProperties": false,
+            "deprecated": "This schema has been deprecated in favor of the Port schema.",
             "description": "The NetworkPort schema describes a network port, which is a discrete physical port that can connect to a network.",
             "longDescription": "This resource shall represent a discrete physical port that can connect to a network in a Redfish implementation.",
             "patternProperties": {
@@ -443,7 +444,8 @@
                 "Id",
                 "Name"
             ],
-            "type": "object"
+            "type": "object",
+            "versionDeprecated": "v1_4_0"
         },
         "OemActions": {
             "additionalProperties": true,
@@ -500,7 +502,7 @@
         },
         "SupportedLinkCapabilities": {
             "additionalProperties": false,
-            "description": "The link capabilities of an assocaited port.",
+            "description": "The link capabilities of an associated port.",
             "longDescription": "This type shall describe the static capabilities of an associated port, irrespective of transient conditions such as cabling, interface module presence, or remote link partner status or configuration.",
             "patternProperties": {
                 "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
@@ -570,6 +572,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#NetworkPort.v1_3_0.NetworkPort"
+    "release": "2020.4",
+    "title": "#NetworkPort.v1_4_0.NetworkPort"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json b/static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json
index 3c28687..3f009ca 100644
--- a/static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json
+++ b/static/redfish/v1/JsonSchemas/OperatingConfig/OperatingConfig.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/OperatingConfig.v1_0_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/OperatingConfig.v1_0_2.json",
     "$ref": "#/definitions/OperatingConfig",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -305,5 +305,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.2",
-    "title": "#OperatingConfig.v1_0_1.OperatingConfig"
+    "title": "#OperatingConfig.v1_0_2.OperatingConfig"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Outlet/Outlet.json b/static/redfish/v1/JsonSchemas/Outlet/Outlet.json
index 603bc31..a77e1c2 100644
--- a/static/redfish/v1/JsonSchemas/Outlet/Outlet.json
+++ b/static/redfish/v1/JsonSchemas/Outlet/Outlet.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Outlet.v1_1_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Outlet.v1_1_1.json",
     "$ref": "#/definitions/Outlet",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -67,7 +67,7 @@
                     ],
                     "description": "Line 1 current sensor.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain a CurrentSensor excerpt that measures current for L1.  This property shall not be present if the outlet does not include an L1 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Current that measures current for L1.  This property shall not be present if the outlet does not include an L1 measurement.",
                     "readonly": true
                 },
                 "Line2": {
@@ -81,7 +81,7 @@
                     ],
                     "description": "Line 2 current sensor.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain a CurrentSensor excerpt that measures current for L2.  This property shall not be present if the outlet does not include an L2 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Current that measures current for L2.  This property shall not be present if the outlet does not include an L2 measurement.",
                     "readonly": true
                 },
                 "Line3": {
@@ -95,7 +95,7 @@
                     ],
                     "description": "Line 3 current sensor.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain a CurrentSensor excerpt that measures current for L3.  This property shall not be present if the outlet does not include an L3 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Current that measures current for L3.  This property shall not be present if the outlet does not include an L3 measurement.",
                     "readonly": true
                 },
                 "Neutral": {
@@ -109,7 +109,7 @@
                     ],
                     "description": "Neutral line current sensor.",
                     "excerptCopy": "SensorCurrentExcerpt",
-                    "longDescription": "This property shall contain a CurrentSensor excerpt that measures current for the Neutral line.  This property shall not be present if the outlet does not include a Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Current that measures current for the Neutral line.  This property shall not be present if the outlet does not include a Neutral measurement.",
                     "readonly": true
                 }
             },
@@ -614,7 +614,7 @@
                     ],
                     "description": "The Line 1 to Line 2 voltage reading for this outlet.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L1 and L2.  This property shall not be present if the outlet does not include an L1-L2 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L1 and L2.  This property shall not be present if the outlet does not include an L1-L2 measurement.",
                     "readonly": true
                 },
                 "Line1ToNeutral": {
@@ -628,7 +628,7 @@
                     ],
                     "description": "The Line 1 to Neutral voltage reading for this outlet.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L1 and Neutral.  This property shall not be present if the outlet does not include an L1-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L1 and Neutral.  This property shall not be present if the outlet does not include an L1-Neutral measurement.",
                     "readonly": true
                 },
                 "Line2ToLine3": {
@@ -642,7 +642,7 @@
                     ],
                     "description": "The Line 2 to Line 3 voltage reading for this outlet.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L2 and L3.  This property shall not be present if the outlet does not include an L2-L3 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L2 and L3.  This property shall not be present if the outlet does not include an L2-L3 measurement.",
                     "readonly": true
                 },
                 "Line2ToNeutral": {
@@ -656,7 +656,7 @@
                     ],
                     "description": "The Line 2 to Neutral voltage reading for this outlet.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L2 and Neutral.  This property shall not be present if the outlet does not include an L2-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L2 and Neutral.  This property shall not be present if the outlet does not include an L2-Neutral measurement.",
                     "readonly": true
                 },
                 "Line3ToLine1": {
@@ -670,7 +670,7 @@
                     ],
                     "description": "The Line 3 to Line 1 voltage reading for this outlet.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L3 and L1.  This property shall not be present if the outlet does not include an L3-L1 measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L3 and L1.  This property shall not be present if the outlet does not include an L3-L1 measurement.",
                     "readonly": true
                 },
                 "Line3ToNeutral": {
@@ -684,7 +684,7 @@
                     ],
                     "description": "The Line 3 to Neutral voltage reading for this outlet.",
                     "excerptCopy": "SensorVoltageExcerpt",
-                    "longDescription": "This property shall contain a VoltageSensor excerpt that measures voltage between L3 and Neutral.  This property shall not be present if the outlet does not include an L3-Neutral measurement.",
+                    "longDescription": "This property shall contain a Sensor excerpt of type Voltage that measures voltage between L3 and Neutral.  This property shall not be present if the outlet does not include an L3-Neutral measurement.",
                     "readonly": true
                 }
             },
@@ -704,5 +704,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#Outlet.v1_1_0.Outlet"
+    "title": "#Outlet.v1_1_1.Outlet"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json b/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
index ef790fa..ed0b491 100644
--- a/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
+++ b/static/redfish/v1/JsonSchemas/PCIeDevice/PCIeDevice.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_5_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_6_0.json",
     "$ref": "#/definitions/PCIeDevice",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -274,6 +274,16 @@
                         "null"
                     ]
                 },
+                "SparePartNumber": {
+                    "description": "The spare part number of the PCIe device.",
+                    "longDescription": "This property shall contain the spare part number of the PCIe device.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_6_0"
+                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the Resource and its subordinate or dependent Resources.",
@@ -382,6 +392,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#PCIeDevice.v1_5_0.PCIeDevice"
+    "release": "2020.4",
+    "title": "#PCIeDevice.v1_6_0.PCIeDevice"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json b/static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json
index 1a8d00a..50ee9c7 100644
--- a/static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json
+++ b/static/redfish/v1/JsonSchemas/PCIeSlots/PCIeSlots.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeSlots.v1_4_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeSlots.v1_4_1.json",
     "$ref": "#/definitions/PCIeSlots",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -140,6 +140,16 @@
                     "description": "The location of the PCIe slot.",
                     "longDescription": "This property shall contain part location information, including a ServiceLabel of the associated PCIe Slot."
                 },
+                "LocationIndicatorActive": {
+                    "description": "An indicator allowing an operator to physically locate this resource.",
+                    "longDescription": "This property shall contain the state of the indicator used to physically identify or locate this resource.  A write to this property shall update the value of IndicatorLED in this resource, if supported, to reflect the implementation of the locating function.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
                     "description": "The OEM extension property.",
@@ -230,16 +240,6 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
                 },
-                "LocationIndicatorActive": {
-                    "description": "An indicator allowing an operator to physically locate this resource.",
-                    "longDescription": "This property shall contain the state of the indicator used to physically identify or locate this resource.  A write to this property shall update the value of IndicatorLED in this resource, if supported, to reflect the implementation of the locating function.",
-                    "readonly": false,
-                    "type": [
-                        "boolean",
-                        "null"
-                    ],
-                    "versionAdded": "v1_4_0"
-                },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
                     "readonly": true
@@ -299,5 +299,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#PCIeSlots.v1_4_0.PCIeSlots"
+    "title": "#PCIeSlots.v1_4_1.PCIeSlots"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Port/Port.json b/static/redfish/v1/JsonSchemas/Port/Port.json
index 43565f1..b247396 100644
--- a/static/redfish/v1/JsonSchemas/Port/Port.json
+++ b/static/redfish/v1/JsonSchemas/Port/Port.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Port.v1_3_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Port.v1_3_1.json",
     "$ref": "#/definitions/Port",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -872,5 +872,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#Port.v1_3_0.Port"
+    "title": "#Port.v1_3_1.Port"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PortMetrics/PortMetrics.json b/static/redfish/v1/JsonSchemas/PortMetrics/PortMetrics.json
index d44a14d..67dc3f7 100644
--- a/static/redfish/v1/JsonSchemas/PortMetrics/PortMetrics.json
+++ b/static/redfish/v1/JsonSchemas/PortMetrics/PortMetrics.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PortMetrics.v1_0_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PortMetrics.v1_0_1.json",
     "$ref": "#/definitions/PortMetrics",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -106,7 +106,7 @@
                 },
                 "PacketCRCErrors": {
                     "description": "The total number of PCRC transient errors detected.",
-                    "longDescription": "This property shall contain the total number of PCRC transient errors detected in received link-local and end-to-ent packets.",
+                    "longDescription": "This property shall contain the total number of PCRC transient errors detected in received link-local and end-to-end packets.",
                     "readonly": true,
                     "type": [
                         "integer",
@@ -124,7 +124,7 @@
                 },
                 "RXStompedECRC": {
                     "description": "The total number of packets received with a stomped ECRC field.",
-                    "longDescription": "This property shall contain the total number of packets that thsi interface received with a stomped ECRC field.",
+                    "longDescription": "This property shall contain the total number of packets that this interface received with a stomped ECRC field.",
                     "readonly": true,
                     "type": [
                         "integer",
@@ -250,5 +250,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.4",
-    "title": "#PortMetrics.v1_0_0.PortMetrics"
+    "title": "#PortMetrics.v1_0_1.PortMetrics"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Power/Power.json b/static/redfish/v1/JsonSchemas/Power/Power.json
index aea5bf9..c3f9c04 100644
--- a/static/redfish/v1/JsonSchemas/Power/Power.json
+++ b/static/redfish/v1/JsonSchemas/Power/Power.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Power.v1_6_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Power.v1_7_0.json",
     "$ref": "#/definitions/Power",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -218,6 +218,7 @@
         },
         "Power": {
             "additionalProperties": false,
+            "deprecated": "This schema has been deprecated in favor of the PowerSubsystem schema.",
             "description": "The Power schema describes power metrics and represents the properties for power consumption and power limiting.",
             "longDescription": "This resource shall contain the power metrics for a Redfish implementation.",
             "patternProperties": {
@@ -332,7 +333,8 @@
                 "Id",
                 "Name"
             ],
-            "type": "object"
+            "type": "object",
+            "versionDeprecated": "v1_7_0"
         },
         "PowerControl": {
             "additionalProperties": false,
@@ -399,8 +401,8 @@
                     "units": "W"
                 },
                 "PowerAvailableWatts": {
-                    "description": "The amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacity value minus the PowerAllocated value.",
-                    "longDescription": "This property shall represent the amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacity value minus the PowerAllocated value.",
+                    "description": "The amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacityWatts value minus the PowerAllocatedWatts value.",
+                    "longDescription": "This property shall represent the amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacityWatts value minus the PowerAllocatedWatts value.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -711,7 +713,7 @@
                 },
                 "FirmwareVersion": {
                     "description": "The firmware version for this power supply.",
-                    "longDescription": "This property shall contain the firwmare version as defined by the manufacturer for the associated power supply.",
+                    "longDescription": "This property shall contain the firmware version as defined by the manufacturer for the associated power supply.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -1274,6 +1276,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.3",
-    "title": "#Power.v1_6_1.Power"
+    "release": "2020.4",
+    "title": "#Power.v1_7_0.Power"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerDistribution/PowerDistribution.json b/static/redfish/v1/JsonSchemas/PowerDistribution/PowerDistribution.json
index 1b93aca..8701ace 100644
--- a/static/redfish/v1/JsonSchemas/PowerDistribution/PowerDistribution.json
+++ b/static/redfish/v1/JsonSchemas/PowerDistribution/PowerDistribution.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/PowerDistribution.v1_0_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PowerDistribution.v1_0_2.json",
     "$ref": "#/definitions/PowerDistribution",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -601,5 +601,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.4",
-    "title": "#PowerDistribution.v1_0_1.PowerDistribution"
+    "title": "#PowerDistribution.v1_0_2.PowerDistribution"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json b/static/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json
new file mode 100644
index 0000000..c4f7038
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json
@@ -0,0 +1,207 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/PowerSubsystem.v1_0_0.json",
+    "$ref": "#/definitions/PowerSubsystem",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "This property contains the available OEM specific actions for this resource.",
+                    "longDescription": "This property shall contain any additional OEM actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM specific actions for this resource.",
+            "longDescription": "This type shall contain any additional OEM actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "PowerAllocation": {
+            "additionalProperties": false,
+            "description": "Power allocation for a subsystem.",
+            "longDescription": "This type shall contain the set of properties describing the allocation of power for a subsystem.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AllocatedWatts": {
+                    "description": "The total amount of power that has been allocated or budgeted to this subsystem.",
+                    "longDescription": "This property shall represent the total power currently allocated or budgeted to this subsystem.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "W"
+                },
+                "RequestedWatts": {
+                    "description": "The potential power, in watts, that the subsystem requests, which might be higher than the current level being consumed because the requested power includes a budget that the subsystem wants for future use.",
+                    "longDescription": "This property shall represent the amount of power, in watts, that the subsystem currently requests to be budgeted for future use.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "W"
+                }
+            },
+            "type": "object"
+        },
+        "PowerSubsystem": {
+            "additionalProperties": false,
+            "description": "This PowerSubsystem schema contains the definition for the power subsystem of a chassis.",
+            "longDescription": "This resource shall represent a power subsystem for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "The Actions property shall contain the available actions for this resource."
+                },
+                "Allocation": {
+                    "$ref": "#/definitions/PowerAllocation",
+                    "description": "Power allocation for this subsystem.",
+                    "longDescription": "This property shall contain the set of properties describing the allocation of power for this subsystem."
+                },
+                "CapacityWatts": {
+                    "description": "The total amount of power that can be allocated to this subsystem.  This value can be either the power supply capacity or the power budget that an upstream chassis assigns to this subsystem.",
+                    "longDescription": "This property shall represent the total power capacity that can be allocated to this subsystem.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "W"
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "PowerSupplies": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/PowerSupplyCollection.json#/definitions/PowerSupplyCollection",
+                    "description": "The link to the collection of power supplies within this subsystem.",
+                    "longDescription": "This property shall contain a link to a resource collection of type PowerSupplyCollection.",
+                    "readonly": true
+                },
+                "PowerSupplyRedundancy": {
+                    "description": "The redundancy information for the set of power supplies in this subsystem.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Redundancy.json#/definitions/RedundantGroup"
+                    },
+                    "longDescription": "This property shall contain redundancy information for the set of power supplies in this subsystem.  The values of the RedundancyGroup array shall reference resources of type PowerSupply.",
+                    "type": "array"
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource."
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2020.4",
+    "title": "#PowerSubsystem.v1_0_0.PowerSubsystem"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSubsystem/index.json b/static/redfish/v1/JsonSchemas/PowerSubsystem/index.json
new file mode 100644
index 0000000..4042b01
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/PowerSubsystem/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+    "@odata.id": "/redfish/v1/JsonSchemas/PowerSubsystem",
+    "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+    "Name": "PowerSubsystem Schema File",
+    "Schema": "#PowerSubsystem.PowerSubsystem",
+    "Description": "PowerSubsystem Schema File Location",
+    "Id": "PowerSubsystem",
+    "Languages": [
+        "en"
+    ],
+    "Languages@odata.count": 1,
+    "Location": [
+        {
+            "Language": "en",
+            "PublicationUri": "http://redfish.dmtf.org/schemas/v1/PowerSubsystem.json",
+            "Uri": "/redfish/v1/JsonSchemas/PowerSubsystem/PowerSubsystem.json"
+        }
+    ],
+    "Location@odata.count": 1
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json b/static/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json
new file mode 100644
index 0000000..b94408a
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json
@@ -0,0 +1,537 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/PowerSupply.v1_0_0.json",
+    "$ref": "#/definitions/PowerSupply",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "#PowerSupply.Reset": {
+                    "$ref": "#/definitions/Reset"
+                },
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "EfficiencyRating": {
+            "additionalProperties": false,
+            "description": "This type describes an efficiency rating for a power supply.",
+            "longDescription": "This type shall describe an efficiency rating for a power supply.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "EfficiencyPercent": {
+                    "description": "The rated efficiency of this power supply at the specified load.",
+                    "longDescription": "This property shall contain the rated efficiency, as a percentage, of this power supply at the specified load.",
+                    "maximum": 100,
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "%"
+                },
+                "LoadPercent": {
+                    "description": "The electrical load for this rating.",
+                    "longDescription": "This property shall contain the load, as a percentage, of this power supply at which this efficiency rating is valid.",
+                    "maximum": 100,
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "%"
+                }
+            },
+            "type": "object"
+        },
+        "InputRange": {
+            "additionalProperties": false,
+            "description": "This type describes an input range for a power supply.",
+            "longDescription": "This type shall describe an input range that the associated power supply can utilize.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "CapacityWatts": {
+                    "description": "The maximum capacity of this power supply when operating in this input range.",
+                    "longDescription": "This property shall contain the maximum amount of power, in watts, that the associated power supply is rated to deliver while operating in this input range.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "W"
+                },
+                "NominalVoltageType": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Circuit.json#/definitions/NominalVoltageType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The input voltage range.",
+                    "longDescription": "This property shall contain the input voltage type of the associated range.",
+                    "readonly": true
+                }
+            },
+            "type": "object"
+        },
+        "Links": {
+            "additionalProperties": false,
+            "description": "The links to other resources that are related to this resource.",
+            "longDescription": "This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
+                "Outlet": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Outlet.json#/definitions/Outlet",
+                    "description": "A link to the outlet connected to this power supply.",
+                    "longDescription": "This property shall contain a link to a resource of type Outlet that represents the outlet connected to this power supply.",
+                    "readonly": false
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "OutputRail": {
+            "additionalProperties": false,
+            "description": "This type describes an output power rail for a power supply.",
+            "longDescription": "This type shall describe an output power rail provided by power supply.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "NominalVoltage": {
+                    "description": "The nominal voltage of this output power rail.",
+                    "longDescription": "This property shall contain the nominal voltage of the associated output power rail.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "PhysicalContext": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext",
+                    "description": "The area or device to which this power rail applies.",
+                    "longDescription": "This property shall contain a description of the device or region within the chassis to which this power rail applies.",
+                    "readonly": true
+                }
+            },
+            "type": "object"
+        },
+        "PowerSupply": {
+            "additionalProperties": false,
+            "description": "The PowerSupply schema describes a power supply unit.",
+            "longDescription": "This resource shall represent a power supply for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "Assembly": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Assembly.json#/definitions/Assembly",
+                    "description": "The link to the assembly associated with this power supply.",
+                    "longDescription": "This property shall contain a link to a resource of type Assembly.",
+                    "readonly": true
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "EfficiencyRatings": {
+                    "description": "The efficiency ratings of this power supply.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/EfficiencyRating"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of efficiency ratings for this power supply.",
+                    "type": "array"
+                },
+                "FirmwareVersion": {
+                    "description": "The firmware version for this power supply.",
+                    "longDescription": "This property shall contain the firmware version as defined by the manufacturer for this power supply.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "HotPluggable": {
+                    "description": "An indication of whether this device can be inserted or removed while the equipment is in operation.",
+                    "longDescription": "This property shall indicate whether the device can be inserted or removed while the underlying equipment otherwise remains in its current operational state.  Devices indicated as hot-pluggable shall allow the device to become operable without altering the operational state of the underlying equipment.  Devices that cannot be inserted or removed from equipment in operation, or devices that cannot become operable without affecting the operational state of that equipment, shall be indicated as not hot-pluggable.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "InputNominalVoltageType": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Circuit.json#/definitions/NominalVoltageType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The nominal voltage type of the line input to this power supply.",
+                    "longDescription": "This property shall contain the nominal voltage type of the input line voltage in use by this power supply.  This value shall be one of the values shown in the NominalVoltageType property in the InputRanges array, if present.",
+                    "readonly": true
+                },
+                "InputRanges": {
+                    "description": "The input ranges that the power supply can use.",
+                    "items": {
+                        "$ref": "#/definitions/InputRange"
+                    },
+                    "longDescription": "This property shall contain a collection of ranges usable by this power supply.",
+                    "type": "array"
+                },
+                "Links": {
+                    "$ref": "#/definitions/Links",
+                    "description": "The links to other resources that are related to this resource.",
+                    "longDescription": "This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."
+                },
+                "Location": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Location",
+                    "description": "The location of the power supply.",
+                    "longDescription": "This property shall contain location information of this power supply."
+                },
+                "LocationIndicatorActive": {
+                    "description": "An indicator allowing an operator to physically locate this resource.",
+                    "longDescription": "This property shall contain the state of the indicator used to physically identify or locate this resource.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                },
+                "Manufacturer": {
+                    "description": "The manufacturer of this power supply.",
+                    "longDescription": "This property shall contain the name of the organization responsible for producing the power supply.  This organization might be the entity from whom the power supply is purchased, but this is not necessarily true.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Metrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/PowerSupplyMetrics.json#/definitions/PowerSupplyMetrics",
+                    "description": "The link to the power supply metrics resource associated with this power supply.",
+                    "longDescription": "This property shall contain a link to a resource of type PowerSupplyMetrics.",
+                    "readonly": true
+                },
+                "Model": {
+                    "description": "The model number for this power supply.",
+                    "longDescription": "This property shall contain the model information as defined by the manufacturer for this power supply.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "OutputRails": {
+                    "description": "The output power rails provided by this power supply.",
+                    "items": {
+                        "$ref": "#/definitions/OutputRail"
+                    },
+                    "longDescription": "This property shall contain an array of output power rails provided by this power supply.  The elements shall be ordered in ascending nominal voltage order.  This ordering is necessary for consistency with Sensor properties in an associated PowerSupplyMetrics resource.",
+                    "type": "array"
+                },
+                "PartNumber": {
+                    "description": "The part number for this power supply.",
+                    "longDescription": "This property shall contain the part number as defined by the manufacturer for this power supply.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "PhaseWiringType": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Circuit.json#/definitions/PhaseWiringType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The number of ungrounded current-carrying conductors (phases) and the total number of conductors (wires) provided for the power supply input connector.",
+                    "longDescription": "This property shall contain the number of ungrounded current-carrying conductors (phases) and the total number of conductors (wires) included in the input connector for the power supply.",
+                    "readonly": true
+                },
+                "PlugType": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Circuit.json#/definitions/PlugType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The type of plug according to NEMA, IEC, or regional standards.",
+                    "longDescription": "This property shall contain the type of physical plug used for the input to this power supply, as defined by IEC, NEMA, or regional standard.",
+                    "readonly": true
+                },
+                "PowerCapacityWatts": {
+                    "description": "The maximum capacity of this power supply.",
+                    "longDescription": "This property shall contain the maximum amount of power, in watts, that this power supply is rated to deliver.",
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "W"
+                },
+                "PowerSupplyType": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/PowerSupplyType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The power supply type (AC or DC).",
+                    "longDescription": "This property shall contain the input power type (AC or DC) of this power supply.",
+                    "readonly": true
+                },
+                "SerialNumber": {
+                    "description": "The serial number for this power supply.",
+                    "longDescription": "This property shall contain the serial number as defined by the manufacturer for this power supply.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "SparePartNumber": {
+                    "description": "The spare part number for this power supply.",
+                    "longDescription": "This property shall contain the spare or replacement part number as defined by the manufacturer for this power supply.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource."
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "PowerSupplyType": {
+            "enum": [
+                "AC",
+                "DC",
+                "ACorDC"
+            ],
+            "enumDescriptions": {
+                "AC": "Alternating Current (AC) power supply.",
+                "ACorDC": "The power supply supports both DC or AC.",
+                "DC": "Direct Current (DC) power supply."
+            },
+            "type": "string"
+        },
+        "Reset": {
+            "additionalProperties": false,
+            "description": "This action resets the power supply.",
+            "longDescription": "This action shall reset a power supply.  A `GracefulRestart` ResetType shall reset the power supply but shall not affect the power output.  A `ForceRestart` ResetType might affect the power supply output.",
+            "parameters": {
+                "ResetType": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/ResetType",
+                    "description": "The type of reset.",
+                    "longDescription": "This parameter shall contain the type of reset.  The service can accept a request without the parameter and shall perform a `GracefulRestart`."
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2020.4",
+    "title": "#PowerSupply.v1_0_0.PowerSupply"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSupply/index.json b/static/redfish/v1/JsonSchemas/PowerSupply/index.json
new file mode 100644
index 0000000..db9b57f
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/PowerSupply/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+    "@odata.id": "/redfish/v1/JsonSchemas/PowerSupply",
+    "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+    "Name": "PowerSupply Schema File",
+    "Schema": "#PowerSupply.PowerSupply",
+    "Description": "PowerSupply Schema File Location",
+    "Id": "PowerSupply",
+    "Languages": [
+        "en"
+    ],
+    "Languages@odata.count": 1,
+    "Location": [
+        {
+            "Language": "en",
+            "PublicationUri": "http://redfish.dmtf.org/schemas/v1/PowerSupply.json",
+            "Uri": "/redfish/v1/JsonSchemas/PowerSupply/PowerSupply.json"
+        }
+    ],
+    "Location@odata.count": 1
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSupplyMetrics/PowerSupplyMetrics.json b/static/redfish/v1/JsonSchemas/PowerSupplyMetrics/PowerSupplyMetrics.json
new file mode 100644
index 0000000..e535f4f
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/PowerSupplyMetrics/PowerSupplyMetrics.json
@@ -0,0 +1,623 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/PowerSupplyMetrics.v1_0_0.json",
+    "$ref": "#/definitions/PowerSupplyMetrics",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "#PowerSupplyMetrics.ResetMetrics": {
+                    "$ref": "#/definitions/ResetMetrics"
+                },
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "CurrentSensors": {
+            "additionalProperties": false,
+            "description": "The current sensors for this power supply.",
+            "longDescription": "This type shall contain properties that describe current sensor readings for a power supply.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Input": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The power supply input.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current sensor that measures current at the input of the power supply.",
+                    "readonly": true
+                },
+                "InputSecondary": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The power supply secondary input.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current sensor that measures current at the secondary input of the power supply.  This property shall not be present if the power supply does not include a secondary input.",
+                    "readonly": true
+                },
+                "Output12Volt": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The 12V nominal output.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current sensor that measures current on a 12 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 12V output.",
+                    "readonly": true
+                },
+                "Output3Volt": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The 3V nominal output.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current sensor that measures current on a 3 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 3V output.",
+                    "readonly": true
+                },
+                "Output48Volt": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The 48V nominal output.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current sensor that measures current on a 48 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 48V output.",
+                    "readonly": true
+                },
+                "Output5Volt": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The 5V nominal output.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current sensor that measures current on a 5 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 5V output.",
+                    "readonly": true
+                },
+                "OutputAux": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The auxiliary (AUX) output.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the current sensor that measures current on an auxiliary (AUX) output power rail.  This property shall not be present if the power supply does not include an auxiliary output.",
+                    "readonly": true
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "PowerSensors": {
+            "additionalProperties": false,
+            "description": "The power sensors for this power supply.",
+            "longDescription": "This type shall contain properties that describe power sensor readings for a power supply.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Input": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorPowerExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The input power reading for the power supply.",
+                    "excerptCopy": "SensorPowerExcerpt",
+                    "longDescription": "This property shall contain the power, measured in Watts, for this power supply unit, as measured at the input of the power supply.",
+                    "readonly": true
+                },
+                "InputSecondary": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorPowerExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The secondary input power reading for the power supply.",
+                    "excerptCopy": "SensorPowerExcerpt",
+                    "longDescription": "This property shall contain the power, measured in Watts, for this power supply unit, as measured at the secondary input of the power supply.  This property shall not appear if the power supply does not contain a secondary input.",
+                    "readonly": true
+                },
+                "Output": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorPowerExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The output power reading for the power supply.",
+                    "excerptCopy": "SensorPowerExcerpt",
+                    "longDescription": "This property shall contain the power, measured in Watts, for this power supply unit, as measured at the output of the power supply.",
+                    "readonly": true
+                }
+            },
+            "type": "object"
+        },
+        "PowerSupplyMetrics": {
+            "additionalProperties": false,
+            "description": "The PowerSupplyMetrics schema contains definitions for the metrics of a power supply.",
+            "longDescription": "This resource shall be used to represent the metrics of a power supply unit for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "EnergykWh": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorEnergykWhExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The energy consumption of this unit.",
+                    "excerptCopy": "SensorEnergykWhExcerpt",
+                    "longDescription": "This property shall contain the total energy, measured in kilowatt-hours (kWh), for this unit, that represents the `Total` ElectricalContext sensor when multiple energy sensors exist.",
+                    "readonly": true
+                },
+                "FanSpeedPercent": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorFanExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The fan speed reading for this power supply.",
+                    "excerptCopy": "SensorFanExcerpt",
+                    "longDescription": "This property shall contain the fan speed sensor for this power supply.",
+                    "readonly": true
+                },
+                "FrequencyHz": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The frequency reading for this power supply.",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the frequency sensor for this power supply.",
+                    "readonly": true
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "InputCurrentAmps": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The input current reading for this power supply.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "longDescription": "This property shall contain the sensor measuring the input current for this power supply.",
+                    "readonly": true
+                },
+                "InputPowerWatts": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorPowerExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The input power reading for this power supply.",
+                    "excerptCopy": "SensorPowerExcerpt",
+                    "longDescription": "This property shall contain the sensor measuring the input power for this power supply.",
+                    "readonly": true
+                },
+                "InputVoltage": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The input voltage reading for this power supply.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the sensor measuring the input voltage for this power supply.",
+                    "readonly": true
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "OutputPowerWatts": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorPowerExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The total power output reading for this power supply.",
+                    "excerptCopy": "SensorPowerExcerpt",
+                    "longDescription": "This property shall contain the sensor measuring the total output power for this power supply.",
+                    "readonly": true
+                },
+                "RailCurrentAmps": {
+                    "description": "The current readings for this power supply.",
+                    "excerptCopy": "SensorCurrentExcerpt",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorCurrentExcerpt"
+                    },
+                    "longDescription": "This property shall contain the output current sensors for this power supply.  The sensors shall appear in the same array order as the OutputRails property in the associated PowerSupply resource.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "RailCurrentAmps@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "RailPowerWatts": {
+                    "description": "The power readings for this power supply.",
+                    "excerptCopy": "SensorPowerExcerpt",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorPowerExcerpt"
+                    },
+                    "longDescription": "This property shall contain the output power sensors for this power supply.  The sensors shall appear in the same array order as the OutputRails property in the associated PowerSupply resource.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "RailPowerWatts@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "RailVoltage": {
+                    "description": "The voltage readings for this power supply.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                    },
+                    "longDescription": "This property shall contain the output voltage sensors for this power supply.  The sensors shall appear in the same array order as the OutputRails property in the associated PowerSupply resource.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "RailVoltage@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource."
+                },
+                "TemperatureCelsius": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The temperature reading for this power supply.",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the temperature sensor for this power supply.",
+                    "readonly": true
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "ResetMetrics": {
+            "additionalProperties": false,
+            "description": "This action resets the summary metrics related to this equipment.",
+            "longDescription": "This action shall reset any time intervals or counted values for this equipment.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "VoltageSensors": {
+            "additionalProperties": false,
+            "description": "The voltage readings for a power supply.",
+            "longDescription": "This type shall contain properties that describe voltage sensor readings for a power supply.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Input": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The power supply input.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage sensor that measures voltage at the input to the power supply.",
+                    "readonly": true
+                },
+                "InputSecondary": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The power supply secondary input.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage sensor that measures voltage at a secondary input to the power supply.  This property shall not be present if the power supply does not include a secondary input.",
+                    "readonly": true
+                },
+                "Output12Volt": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The 12V nominal output.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage sensor that measures voltage on a 12 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 12V output.",
+                    "readonly": true
+                },
+                "Output3Volt": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The 3V nominal output.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage sensor that measures voltage on a 3 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 3V output.",
+                    "readonly": true
+                },
+                "Output48Volt": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The 48V nominal output.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage sensor that measures voltage on a 48 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 48V output.",
+                    "readonly": true
+                },
+                "Output5Volt": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The 5V nominal output.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage sensor that measures voltage on a 3 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 3V output.",
+                    "readonly": true
+                },
+                "OutputAux": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorVoltageExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The auxiliary (AUX) output.",
+                    "excerptCopy": "SensorVoltageExcerpt",
+                    "longDescription": "This property shall contain the voltage sensor that measures current on an auxiliary (AUX) output power rail.  This property shall not be present if the power supply does not include an auxiliary output.",
+                    "readonly": true
+                }
+            },
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2020.4",
+    "title": "#PowerSupplyMetrics.v1_0_0.PowerSupplyMetrics"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/PowerSupplyMetrics/index.json b/static/redfish/v1/JsonSchemas/PowerSupplyMetrics/index.json
new file mode 100644
index 0000000..f0ab9c2
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/PowerSupplyMetrics/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+    "@odata.id": "/redfish/v1/JsonSchemas/PowerSupplyMetrics",
+    "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+    "Name": "PowerSupplyMetrics Schema File",
+    "Schema": "#PowerSupplyMetrics.PowerSupplyMetrics",
+    "Description": "PowerSupplyMetrics Schema File Location",
+    "Id": "PowerSupplyMetrics",
+    "Languages": [
+        "en"
+    ],
+    "Languages@odata.count": 1,
+    "Location": [
+        {
+            "Language": "en",
+            "PublicationUri": "http://redfish.dmtf.org/schemas/v1/PowerSupplyMetrics.json",
+            "Uri": "/redfish/v1/JsonSchemas/PowerSupplyMetrics/PowerSupplyMetrics.json"
+        }
+    ],
+    "Location@odata.count": 1
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Processor/Processor.json b/static/redfish/v1/JsonSchemas/Processor/Processor.json
index b60d4fa..40349c9 100644
--- a/static/redfish/v1/JsonSchemas/Processor/Processor.json
+++ b/static/redfish/v1/JsonSchemas/Processor/Processor.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Processor.v1_10_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Processor.v1_11_0.json",
     "$ref": "#/definitions/Processor",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -357,6 +357,19 @@
                 "Endpoints@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
+                "Memory": {
+                    "description": "An array of links to the memory associated with this processor.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Memory.json#/definitions/Memory"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type Memory that are associated with this processor.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_11_0"
+                },
+                "Memory@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
                     "description": "The OEM extension property.",
@@ -385,6 +398,57 @@
             },
             "type": "object"
         },
+        "MemorySummary": {
+            "additionalProperties": false,
+            "description": "The summary of all memory associated with a processor.",
+            "longDescription": "This type shall contain properties that describe the summary of all memory that are associated with a processor.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Metrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/MemoryMetrics.json#/definitions/MemoryMetrics",
+                    "description": "The link to the memory metrics associated with all memory of this processor.",
+                    "longDescription": "This property shall contain a link to a resource of type MemoryMetrics that contains the metrics associated with all memory of this processor.",
+                    "readonly": true,
+                    "versionAdded": "v1_11_0"
+                },
+                "TotalCacheSizeMiB": {
+                    "description": "Total size of cache memory of this processor.",
+                    "longDescription": "This property shall contain the total size of cache memory of this processor.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "units": "MiBy",
+                    "versionAdded": "v1_11_0"
+                },
+                "TotalMemorySizeMiB": {
+                    "description": "Total size of volatile memory of this processor.",
+                    "longDescription": "This property shall contain the total size of non-cache, volatile memory of this processor.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "units": "MiBy",
+                    "versionAdded": "v1_11_0"
+                }
+            },
+            "type": "object"
+        },
         "OemActions": {
             "additionalProperties": true,
             "description": "The available OEM-specific actions for this resource.",
@@ -490,6 +554,13 @@
                     "readonly": true,
                     "versionAdded": "v1_9_0"
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_11_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -501,6 +572,13 @@
                     ],
                     "readonly": true
                 },
+                "EnvironmentMetrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json#/definitions/EnvironmentMetrics",
+                    "description": "The link to the environment metrics for this processor.",
+                    "longDescription": "This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this processor.",
+                    "readonly": true,
+                    "versionAdded": "v1_11_0"
+                },
                 "FPGA": {
                     "$ref": "#/definitions/FPGA",
                     "description": "The properties for processors of the FPGA type.",
@@ -596,6 +674,21 @@
                     "units": "W",
                     "versionAdded": "v1_4_0"
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_11_0"
+                },
+                "MemorySummary": {
+                    "$ref": "#/definitions/MemorySummary",
+                    "description": "The summary of all memory associated with this processor.",
+                    "longDescription": "This property shall contain properties that describe the summary of all memory that are associated with this processor.",
+                    "versionAdded": "v1_11_0"
+                },
                 "Metrics": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/ProcessorMetrics.json#/definitions/ProcessorMetrics",
                     "description": "The link to the metrics associated with this processor.",
@@ -719,6 +812,16 @@
                         "null"
                     ]
                 },
+                "SparePartNumber": {
+                    "description": "The spare part number of the processor.",
+                    "longDescription": "This property shall contain the spare part number of the processor.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_11_0"
+                },
                 "SpeedLimitMHz": {
                     "description": "The clock limit of the processor in MHz.",
                     "longDescription": "This property shall contain the clock limit of the processor in MHz. This value shall be within the range of MinSpeedMHz and MaxSpeedMHz as provided by the manufacturer of this processor.",
@@ -1110,8 +1213,8 @@
                 "GDDR3": "Double data rate type three synchronous graphics random-access memory.",
                 "GDDR4": "Double data rate type four synchronous graphics random-access memory.",
                 "GDDR5": "Double data rate type five synchronous graphics random-access memory.",
-                "GDDR5X": "Double data rate type five synchronous graphics random-access memory.",
-                "GDDR6": "Double data rate type five synchronous graphics random-access memory.",
+                "GDDR5X": "Double data rate type five X synchronous graphics random-access memory.",
+                "GDDR6": "Double data rate type six synchronous graphics random-access memory.",
                 "HBM1": "High Bandwidth Memory.",
                 "HBM2": "The second generation of High Bandwidth Memory.",
                 "HBM3": "The third generation of High Bandwidth Memory.",
@@ -1236,6 +1339,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Processor.v1_10_0.Processor"
+    "release": "2020.4",
+    "title": "#Processor.v1_11_0.Processor"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ProcessorMetrics/ProcessorMetrics.json b/static/redfish/v1/JsonSchemas/ProcessorMetrics/ProcessorMetrics.json
index 9e357e8..6d7e2d9 100644
--- a/static/redfish/v1/JsonSchemas/ProcessorMetrics/ProcessorMetrics.json
+++ b/static/redfish/v1/JsonSchemas/ProcessorMetrics/ProcessorMetrics.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ProcessorMetrics.v1_1_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ProcessorMetrics.v1_2_0.json",
     "$ref": "#/definitions/ProcessorMetrics",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#ProcessorMetrics.ClearCurrentPeriod": {
+                    "$ref": "#/definitions/ClearCurrentPeriod"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this resource.",
@@ -152,6 +155,73 @@
             },
             "type": "object"
         },
+        "CacheMetricsTotal": {
+            "additionalProperties": false,
+            "description": "The total cache metrics for a processor.",
+            "longDescription": "This property shall contain properties that describe the metrics for all of the cache memory for a processor.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "CurrentPeriod": {
+                    "$ref": "#/definitions/CurrentPeriod",
+                    "description": "The cache metrics since the last reset for this processor.",
+                    "longDescription": "This property shall contain properties that describe the metrics for the current period of cache memory for this processor.",
+                    "versionAdded": "v1_2_0"
+                },
+                "LifeTime": {
+                    "$ref": "#/definitions/LifeTime",
+                    "description": "The cache metrics for the lifetime of this processor.",
+                    "longDescription": "This property shall contain properties that describe the metrics for the lifetime of cache memory for this processor.",
+                    "versionAdded": "v1_2_0"
+                }
+            },
+            "type": "object"
+        },
+        "ClearCurrentPeriod": {
+            "additionalProperties": false,
+            "description": "This action sets the CurrentPeriod property's values to 0.",
+            "longDescription": "This action shall set the CurrentPeriod property's values to 0.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_2_0"
+        },
         "CoreMetrics": {
             "additionalProperties": false,
             "description": "The processor core metrics.",
@@ -235,6 +305,90 @@
             },
             "type": "object"
         },
+        "CurrentPeriod": {
+            "additionalProperties": false,
+            "description": "The cache memory metrics since the last system reset or ClearCurrentPeriod action for a processor.",
+            "longDescription": "This type shall describe the cache memory metrics since last system reset or ClearCurrentPeriod action for a processor.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "CorrectableECCErrorCount": {
+                    "description": "The number of the correctable errors of cache memory since reset.",
+                    "longDescription": "This property shall contain the number of correctable errors of cache memory since reset.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of CorrectableECCErrorCount over all processors.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                },
+                "UncorrectableECCErrorCount": {
+                    "description": "The number of the uncorrectable errors of cache memory since reset.",
+                    "longDescription": "This property shall contain the number of uncorrectable errors of cache memory since reset.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of UncorrectableECCErrorCount over all processors.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                }
+            },
+            "type": "object"
+        },
+        "LifeTime": {
+            "additionalProperties": false,
+            "description": "The cache memory metrics for the lifetime for a processor.",
+            "longDescription": "This type shall describe the cache memory metrics since manufacturing for a processor.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "CorrectableECCErrorCount": {
+                    "description": "The number of the correctable errors for the lifetime of the cache memory.",
+                    "longDescription": "This property shall contain the number of the correctable errors for the lifetime of cache memory.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of CorrectableECCErrorCount over all processors.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                },
+                "UncorrectableECCErrorCount": {
+                    "description": "The number of the uncorrectable errors for the lifetime of the cache memory.",
+                    "longDescription": "This property shall contain the number of the uncorrectable errors for the lifetime of cache memory.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of UncorrectableECCErrorCount over all processors.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                }
+            },
+            "type": "object"
+        },
         "OemActions": {
             "additionalProperties": true,
             "description": "The available OEM-specific actions for this resource.",
@@ -323,7 +477,14 @@
                     "longDescription": "This property shall contain properties that describe this processor's cache.  When this resource is subordinate to the ProcessorSummary object, this property is not applicable.",
                     "type": "array"
                 },
+                "CacheMetricsTotal": {
+                    "$ref": "#/definitions/CacheMetricsTotal",
+                    "description": "The total cache metrics for this processor.",
+                    "longDescription": "This property shall contain properties that describe the metrics for all of the cache memory of this processor.",
+                    "versionAdded": "v1_2_0"
+                },
                 "ConsumedPowerWatt": {
+                    "deprecated": "This property has been deprecated in favor of the properties in EnvironmentMetrics.",
                     "description": "The power, in watts, that the processor has consumed.",
                     "longDescription": "This property shall contain the power, in watts, that the processor has consumed.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of power, in watts, that all processors have consumed.",
                     "readonly": true,
@@ -331,7 +492,8 @@
                         "number",
                         "null"
                     ],
-                    "units": "W"
+                    "units": "W",
+                    "versionDeprecated": "v1_2_0"
                 },
                 "CoreMetrics": {
                     "description": "The processor core metrics.",
@@ -417,14 +579,16 @@
                     "units": "By"
                 },
                 "TemperatureCelsius": {
+                    "deprecated": "This property has been deprecated in favor of the properties in EnvironmentMetrics.",
                     "description": "The temperature of the processor.",
-                    "longDescription": "This property shall contain the temperature, in Celsius, of the processor.  When this resource is subordinate to the ProcessorSummary object, this property shall be the average temperature, in Celcius, over all processors.",
+                    "longDescription": "This property shall contain the temperature, in Celsius, of the processor.  When this resource is subordinate to the ProcessorSummary object, this property shall be the average temperature, in Celsius, over all processors.",
                     "readonly": true,
                     "type": [
                         "number",
                         "null"
                     ],
-                    "units": "Cel"
+                    "units": "Cel",
+                    "versionDeprecated": "v1_2_0"
                 },
                 "ThrottlingCelsius": {
                     "description": "The CPU margin to throttle (temperature offset in degree Celsius).",
@@ -458,6 +622,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.1",
-    "title": "#ProcessorMetrics.v1_1_1.ProcessorMetrics"
+    "release": "2020.4",
+    "title": "#ProcessorMetrics.v1_2_0.ProcessorMetrics"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json b/static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json
index 89e7fd1..e08cae8 100644
--- a/static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json
+++ b/static/redfish/v1/JsonSchemas/Redundancy/Redundancy.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Redundancy.v1_3_5.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Redundancy.v1_4_0.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -186,9 +186,111 @@
                 "NotRedundant": "v1_3_0"
             },
             "type": "string"
+        },
+        "RedundancyType": {
+            "enum": [
+                "Failover",
+                "NPlusM",
+                "Sharing",
+                "Sparing",
+                "NotRedundant"
+            ],
+            "enumDescriptions": {
+                "Failover": "Failure of one unit automatically causes a standby or offline unit in the redundancy set to take over its functions.",
+                "NPlusM": "Multiple units are available and active such that normal operation will continue if one or more units fail.",
+                "NotRedundant": "The subsystem is not configured in a redundancy mode, either due to configuration or the functionality has been disabled by the user.",
+                "Sharing": "Multiple units contribute or share such that operation will continue, but at a reduced capacity, if one or more units fail.",
+                "Sparing": "One or more spare units are available to take over the function of a failed unit, but takeover is not automatic."
+            },
+            "enumLongDescriptions": {
+                "Failover": "This value shall indicate that a failure of one unit automatically causes a standby or offline unit in the redundancy set to take over its functions.",
+                "NPlusM": "This value shall indicate that the capacity or services provided by the set of N+M devices can withstand failure of up to M units, with all units in the group normally providing capacity or service."
+            },
+            "type": "string"
+        },
+        "RedundantGroup": {
+            "additionalProperties": false,
+            "description": "The redundancy information for the devices in a redundancy group.",
+            "longDescription": "This type shall contain redundancy information for the set of devices in this redundancy group.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "MaxSupportedInGroup": {
+                    "description": "The maximum number of devices supported in this redundancy group.",
+                    "longDescription": "This property shall contain the maximum number of devices allowed in the redundancy group.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
+                "MinNeededInGroup": {
+                    "description": "The minimum number of devices needed for this group to be redundant.",
+                    "longDescription": "This property shall contain the minimum number of functional devices needed in the redundancy group for the current redundancy mode to be fault tolerant.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
+                "RedundancyGroup": {
+                    "description": "The links to the devices included in this redundancy group.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Resource"
+                    },
+                    "longDescription": "This property shall contain the links to the resources that represent the devices that are part of this redundancy group.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
+                "RedundancyGroup@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "RedundancyType": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/RedundancyType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The redundancy mode of the group.",
+                    "longDescription": "This property shall contain the information about the redundancy mode of this redundancy group.",
+                    "readonly": true,
+                    "versionAdded": "v1_4_0"
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource.",
+                    "versionAdded": "v1_4_0"
+                }
+            },
+            "required": [
+                "RedundancyType",
+                "MinNeededInGroup",
+                "Status",
+                "RedundancyGroup"
+            ],
+            "type": "object"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2017.3",
-    "title": "#Redundancy.v1_3_5"
+    "release": "2020.4",
+    "title": "#Redundancy.v1_4_0"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Resource/Resource.json b/static/redfish/v1/JsonSchemas/Resource/Resource.json
index fb15986..8a62270 100644
--- a/static/redfish/v1/JsonSchemas/Resource/Resource.json
+++ b/static/redfish/v1/JsonSchemas/Resource/Resource.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_10_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_11_0.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -1037,6 +1037,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Resource.v1_10_0"
+    "release": "2020.4",
+    "title": "#Resource.v1_11_0"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ResourceBlock/ResourceBlock.json b/static/redfish/v1/JsonSchemas/ResourceBlock/ResourceBlock.json
index ed8874e..7620a40 100644
--- a/static/redfish/v1/JsonSchemas/ResourceBlock/ResourceBlock.json
+++ b/static/redfish/v1/JsonSchemas/ResourceBlock/ResourceBlock.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ResourceBlock.v1_3_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ResourceBlock.v1_3_4.json",
     "$ref": "#/definitions/ResourceBlock",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -622,5 +622,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.3",
-    "title": "#ResourceBlock.v1_3_3.ResourceBlock"
+    "title": "#ResourceBlock.v1_3_4.ResourceBlock"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Role/Role.json b/static/redfish/v1/JsonSchemas/Role/Role.json
index f574bf2..2efc830 100644
--- a/static/redfish/v1/JsonSchemas/Role/Role.json
+++ b/static/redfish/v1/JsonSchemas/Role/Role.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Role.v1_2_5.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Role.v1_3_0.json",
     "$ref": "#/definitions/Role",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -90,6 +90,13 @@
                     "longDescription": "This property shall contain the available actions for this resource.",
                     "versionAdded": "v1_1_0"
                 },
+                "AlternateRoleId": {
+                    "description": "An equivalent role to use when this role is restricted.",
+                    "longDescription": "This property shall contain a non-restricted `RoleId` intended to be used in its place when the Restricted property contains the value `true`.",
+                    "readonly": true,
+                    "type": "string",
+                    "versionAdded": "v1_3_0"
+                },
                 "AssignedPrivileges": {
                     "description": "The Redfish privileges for this role.",
                     "items": {
@@ -115,8 +122,8 @@
                     "readonly": true
                 },
                 "IsPredefined": {
-                    "description": "An indication of whether the role is a Redfish-predefined role rather than a custom Redfish role.",
-                    "longDescription": "This property shall indicate whether the role is a Redfish-predefined role rather than a custom Redfish role.",
+                    "description": "An indication of whether the role is predefined by Redfish or an OEM rather than a client-defined role.",
+                    "longDescription": "This property shall indicate whether the role is predefined by Redfish or an OEM as contrasted with a client-defined role.",
                     "readonly": true,
                     "type": "boolean"
                 },
@@ -138,6 +145,13 @@
                     "readonly": false,
                     "type": "array"
                 },
+                "Restricted": {
+                    "description": "An indication of whether use of the role is restricted.",
+                    "longDescription": "This property shall indicate whether use of the role is restricted by a service as defined by the 'Restricted roles and restricted privileges' clause of the Redfish Specification.  If this property is not present, the value shall be assumed to be `false`.",
+                    "readonly": true,
+                    "type": "boolean",
+                    "versionAdded": "v1_3_0"
+                },
                 "RoleId": {
                     "description": "The name of the role.",
                     "longDescription": "This property shall contain the string name of the role.  This property shall contain the same value as the Id property.",
@@ -159,6 +173,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2017.2",
-    "title": "#Role.v1_2_5.Role"
+    "release": "2020.4",
+    "title": "#Role.v1_3_0.Role"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/RouteEntry/RouteEntry.json b/static/redfish/v1/JsonSchemas/RouteEntry/RouteEntry.json
index 3ea5398..f28a163 100644
--- a/static/redfish/v1/JsonSchemas/RouteEntry/RouteEntry.json
+++ b/static/redfish/v1/JsonSchemas/RouteEntry/RouteEntry.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/RouteEntry.v1_0_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/RouteEntry.v1_0_1.json",
     "$ref": "#/definitions/RouteEntry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -143,5 +143,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.4",
-    "title": "#RouteEntry.v1_0_0.RouteEntry"
+    "title": "#RouteEntry.v1_0_1.RouteEntry"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/RouteSetEntry/RouteSetEntry.json b/static/redfish/v1/JsonSchemas/RouteSetEntry/RouteSetEntry.json
index fa78710..6aed3a9 100644
--- a/static/redfish/v1/JsonSchemas/RouteSetEntry/RouteSetEntry.json
+++ b/static/redfish/v1/JsonSchemas/RouteSetEntry/RouteSetEntry.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/RouteSetEntry.v1_0_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/RouteSetEntry.v1_0_1.json",
     "$ref": "#/definitions/RouteSetEntry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -148,5 +148,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.4",
-    "title": "#RouteSetEntry.v1_0_0.RouteSetEntry"
+    "title": "#RouteSetEntry.v1_0_1.RouteSetEntry"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Schedule/Schedule.json b/static/redfish/v1/JsonSchemas/Schedule/Schedule.json
index 0333c51..84a6554 100644
--- a/static/redfish/v1/JsonSchemas/Schedule/Schedule.json
+++ b/static/redfish/v1/JsonSchemas/Schedule/Schedule.json
@@ -1,7 +1,7 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Schedule.v1_2_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Schedule.v1_2_2.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "DayOfWeek": {
             "description": "Days of the week.",
@@ -126,7 +126,7 @@
                             "null"
                         ]
                     },
-                    "longDescription": "Each value shall be an ISO 8601 conformant interval specifying when occurences are enabled.",
+                    "longDescription": "Each value shall be an ISO 8601 conformant interval specifying when occurrences are enabled.",
                     "readonly": false,
                     "type": "array",
                     "versionAdded": "v1_1_0"
@@ -201,5 +201,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.2",
-    "title": "#Schedule.v1_2_1"
+    "title": "#Schedule.v1_2_2"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json b/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
index bdf9e7c..77650e3 100644
--- a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
+++ b/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_1_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_2_0.json",
     "$ref": "#/definitions/Sensor",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -226,7 +226,7 @@
                 },
                 "ApparentVA": {
                     "description": "The product of voltage and current for an AC circuit, in Volt-Ampere units.",
-                    "excerpt": "SensorPower",
+                    "excerpt": "SensorPower,SensorPowerArray",
                     "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
@@ -291,7 +291,7 @@
                 "LifetimeReading": {
                     "description": "The total accumulation value for this sensor.",
                     "excerpt": "SensorEnergykWh",
-                    "longDescription": "This property shall contain the total accumulation of the Reading property over the sensor's life time.  This value shall not be reset by the ResetStatistics action.",
+                    "longDescription": "This property shall contain the total accumulation of the Reading property over the sensor's life time.  This value shall not be reset by the ResetMetrics action.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -345,7 +345,7 @@
                 },
                 "PeakReading": {
                     "description": "The peak sensor value.",
-                    "longDescription": "This property shall contain the peak sensor value since the last ResetStatistics action was performed or the service last reset the time-based property values.",
+                    "longDescription": "This property shall contain the peak sensor value since the last ResetMetrics action was performed or the service last reset the time-based property values.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -372,7 +372,7 @@
                         }
                     ],
                     "description": "The area or device to which this sensor measurement applies.",
-                    "excerpt": "SensorArray",
+                    "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
                     "readonly": true
                 },
@@ -386,13 +386,13 @@
                         }
                     ],
                     "description": "The usage or location within a device to which this sensor measurement applies.",
-                    "excerpt": "SensorArray",
+                    "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance.",
                     "readonly": true
                 },
                 "PowerFactor": {
                     "description": "The power factor for this sensor.",
-                    "excerpt": "SensorPower",
+                    "excerpt": "SensorPower,SensorPowerArray",
                     "longDescription": "This property shall identify the quotient of PowerRealWatts and PowerApparentVA for a circuit.  PowerFactor is expressed in unit-less 1/100ths.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "maximum": 1,
                     "minimum": 0,
@@ -413,7 +413,7 @@
                 },
                 "ReactiveVAR": {
                     "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units.",
-                    "excerpt": "SensorPower",
+                    "excerpt": "SensorPower,SensorPowerArray",
                     "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
@@ -453,7 +453,7 @@
                 "ReadingTime": {
                     "description": "The date and time that the reading was acquired from the sensor.",
                     "format": "date-time",
-                    "longDescription": "This property shall contain the date and timetime that the reading data was acquired from the sensor.  This value is used to synchronize readings from multiple sensors, and does not represent the time at which the resource was accessed.",
+                    "longDescription": "This property shall contain the date and time that the reading data was acquired from the sensor.  This value is used to synchronize readings from multiple sensors, and does not represent the time at which the resource was accessed.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -483,6 +483,19 @@
                         "null"
                     ]
                 },
+                "RelatedItem": {
+                    "description": "An array of links to resources or objects that this sensor services.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources or objects that this sensor services.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_2_0"
+                },
+                "RelatedItem@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "SensingFrequency": {
                     "deprecated": "This property has been deprecated in favor of the SensingInterval property, which uses the duration time format for interoperability.",
                     "description": "The time interval between readings of the physical sensor.",
@@ -509,13 +522,25 @@
                     "description": "The date and time when the time-based properties were last reset.",
                     "excerpt": "SensorEnergykWh",
                     "format": "date-time",
-                    "longDescription": "This property shall contain the date and time when the ResetStatistics action was last performed or the service last reset the time-based property values.",
+                    "longDescription": "This property shall contain the date and time when the ResetMetrics action was last performed or the service last reset the time-based property values.",
                     "readonly": true,
                     "type": [
                         "string",
                         "null"
                     ]
                 },
+                "SpeedRPM": {
+                    "description": "The rotational speed.",
+                    "excerpt": "SensorFan,SensorFanArray",
+                    "longDescription": "This property shall contain a reading of the rotational speed of the device in revolutions per minute (RPM) units.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "RPM",
+                    "versionAdded": "v1_2_0"
+                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "The status and health of the resource and its subordinate or dependent resources.",
@@ -590,6 +615,18 @@
                         "null"
                     ]
                 },
+                "DeviceName": {
+                    "description": "The name of the device.",
+                    "excerpt": "SensorArray,SensorFanArray",
+                    "excerptCopyOnly": true,
+                    "longDescription": "This property shall contain the name of the device associated with this sensor.  If the device is represented by a resource, the value shall contain the value of the Name property of the associated resource.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                },
                 "PhysicalContext": {
                     "anyOf": [
                         {
@@ -600,7 +637,7 @@
                         }
                     ],
                     "description": "The area or device to which this sensor measurement applies.",
-                    "excerpt": "SensorArray",
+                    "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
                     "readonly": true
                 },
@@ -614,7 +651,7 @@
                         }
                     ],
                     "description": "The usage or location within a device to which this sensor measurement applies.",
-                    "excerpt": "SensorArray",
+                    "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
                     "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance.",
                     "readonly": true
                 },
@@ -731,7 +768,7 @@
                 "LifetimeReading": {
                     "description": "The total accumulation value for this sensor.",
                     "excerpt": "SensorEnergykWh",
-                    "longDescription": "This property shall contain the total accumulation of the Reading property over the sensor's life time.  This value shall not be reset by the ResetStatistics action.",
+                    "longDescription": "This property shall contain the total accumulation of the Reading property over the sensor's life time.  This value shall not be reset by the ResetMetrics action.",
                     "readonly": true,
                     "type": [
                         "number",
@@ -753,7 +790,7 @@
                     "description": "The date and time when the time-based properties were last reset.",
                     "excerpt": "SensorEnergykWh",
                     "format": "date-time",
-                    "longDescription": "This property shall contain the date and time when the ResetStatistics action was last performed or the service last reset the time-based property values.",
+                    "longDescription": "This property shall contain the date and time when the ResetMetrics action was last performed or the service last reset the time-based property values.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -807,6 +844,264 @@
             },
             "type": "object"
         },
+        "SensorFanArrayExcerpt": {
+            "additionalProperties": false,
+            "description": "The Sensor schema describes a sensor and its properties.",
+            "excerpt": "SensorFanArray",
+            "longDescription": "This resource shall represent a sensor for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "DataSourceUri": {
+                    "description": "The link to the resource that provides the data for this sensor.",
+                    "excerptCopyOnly": true,
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "DeviceName": {
+                    "description": "The name of the device.",
+                    "excerpt": "SensorArray,SensorFanArray",
+                    "excerptCopyOnly": true,
+                    "longDescription": "This property shall contain the name of the device associated with this sensor.  If the device is represented by a resource, the value shall contain the value of the Name property of the associated resource.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_2_0"
+                },
+                "PhysicalContext": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The area or device to which this sensor measurement applies.",
+                    "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
+                    "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
+                    "readonly": true
+                },
+                "PhysicalSubContext": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalSubContext"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The usage or location within a device to which this sensor measurement applies.",
+                    "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
+                    "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance.",
+                    "readonly": true
+                },
+                "Reading": {
+                    "description": "The sensor value.",
+                    "excerpt": "Sensor",
+                    "longDescription": "This property shall contain the sensor value.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "SpeedRPM": {
+                    "description": "The rotational speed.",
+                    "excerpt": "SensorFan,SensorFanArray",
+                    "longDescription": "This property shall contain a reading of the rotational speed of the device in revolutions per minute (RPM) units.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "RPM",
+                    "versionAdded": "v1_2_0"
+                }
+            },
+            "type": "object"
+        },
+        "SensorFanExcerpt": {
+            "additionalProperties": false,
+            "description": "The Sensor schema describes a sensor and its properties.",
+            "excerpt": "SensorFan",
+            "longDescription": "This resource shall represent a sensor for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "DataSourceUri": {
+                    "description": "The link to the resource that provides the data for this sensor.",
+                    "excerptCopyOnly": true,
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Reading": {
+                    "description": "The sensor value.",
+                    "excerpt": "Sensor",
+                    "longDescription": "This property shall contain the sensor value.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "SpeedRPM": {
+                    "description": "The rotational speed.",
+                    "excerpt": "SensorFan,SensorFanArray",
+                    "longDescription": "This property shall contain a reading of the rotational speed of the device in revolutions per minute (RPM) units.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "RPM",
+                    "versionAdded": "v1_2_0"
+                }
+            },
+            "type": "object"
+        },
+        "SensorPowerArrayExcerpt": {
+            "additionalProperties": false,
+            "description": "The Sensor schema describes a sensor and its properties.",
+            "excerpt": "SensorPowerArray",
+            "longDescription": "This resource shall represent a sensor for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "ApparentVA": {
+                    "description": "The product of voltage and current for an AC circuit, in Volt-Ampere units.",
+                    "excerpt": "SensorPower,SensorPowerArray",
+                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "V.A"
+                },
+                "DataSourceUri": {
+                    "description": "The link to the resource that provides the data for this sensor.",
+                    "excerptCopyOnly": true,
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain a URI to the resource that provides the source of the excerpt contained within this copy.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "PhysicalContext": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The area or device to which this sensor measurement applies.",
+                    "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
+                    "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
+                    "readonly": true
+                },
+                "PhysicalSubContext": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalSubContext"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The usage or location within a device to which this sensor measurement applies.",
+                    "excerpt": "SensorArray,SensorFanArray,SensorPowerArray",
+                    "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance.",
+                    "readonly": true
+                },
+                "PowerFactor": {
+                    "description": "The power factor for this sensor.",
+                    "excerpt": "SensorPower,SensorPowerArray",
+                    "longDescription": "This property shall identify the quotient of PowerRealWatts and PowerApparentVA for a circuit.  PowerFactor is expressed in unit-less 1/100ths.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "maximum": 1,
+                    "minimum": 0,
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "ReactiveVAR": {
+                    "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units.",
+                    "excerpt": "SensorPower,SensorPowerArray",
+                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ],
+                    "units": "V.A"
+                },
+                "Reading": {
+                    "description": "The sensor value.",
+                    "excerpt": "Sensor",
+                    "longDescription": "This property shall contain the sensor value.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                }
+            },
+            "type": "object"
+        },
         "SensorPowerExcerpt": {
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
@@ -829,7 +1124,7 @@
             "properties": {
                 "ApparentVA": {
                     "description": "The product of voltage and current for an AC circuit, in Volt-Ampere units.",
-                    "excerpt": "SensorPower",
+                    "excerpt": "SensorPower,SensorPowerArray",
                     "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
@@ -851,7 +1146,7 @@
                 },
                 "PowerFactor": {
                     "description": "The power factor for this sensor.",
-                    "excerpt": "SensorPower",
+                    "excerpt": "SensorPower,SensorPowerArray",
                     "longDescription": "This property shall identify the quotient of PowerRealWatts and PowerApparentVA for a circuit.  PowerFactor is expressed in unit-less 1/100ths.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "maximum": 1,
                     "minimum": 0,
@@ -863,7 +1158,7 @@
                 },
                 "ReactiveVAR": {
                     "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units.",
-                    "excerpt": "SensorPower",
+                    "excerpt": "SensorPower,SensorPowerArray",
                     "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
@@ -985,7 +1280,7 @@
                 },
                 "DwellTime": {
                     "description": "The duration the sensor value must violate the threshold before the threshold is activated.",
-                    "longDescription": "This property shall indicate the duration the sensor value must violate the threshold before the threshold is activated.",
+                    "longDescription": "This property shall indicate the duration the sensor value violates the threshold before the threshold is activated.",
                     "pattern": "-?P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?",
                     "readonly": false,
                     "type": [
@@ -1047,11 +1342,23 @@
                     "description": "The value at which the reading is below normal range.",
                     "longDescription": "This property shall contain the value at which the Reading property is below normal range.  The value of the property shall use the same units as the Reading property."
                 },
+                "LowerCautionUser": {
+                    "$ref": "#/definitions/Threshold",
+                    "description": "The value at which the reading is below normal range.",
+                    "longDescription": "This property shall contain the value at which the Reading property is below normal range.  The value of the property shall use the same units as the Reading property.",
+                    "versionAdded": "v1_2_0"
+                },
                 "LowerCritical": {
                     "$ref": "#/definitions/Threshold",
                     "description": "The value at which the reading is below normal range but not yet fatal.",
                     "longDescription": "This property shall contain the value at which the Reading property is below the normal range but is not yet fatal.  The value of the property shall use the same units as the Reading property."
                 },
+                "LowerCriticalUser": {
+                    "$ref": "#/definitions/Threshold",
+                    "description": "The value at which the reading is below normal range but not yet fatal.",
+                    "longDescription": "This property shall contain the value at which the Reading property is below the normal range but is not yet fatal.  The value of the property shall use the same units as the Reading property.",
+                    "versionAdded": "v1_2_0"
+                },
                 "LowerFatal": {
                     "$ref": "#/definitions/Threshold",
                     "description": "The value at which the reading is below normal range and fatal.",
@@ -1062,11 +1369,23 @@
                     "description": "The value at which the reading is above normal range.",
                     "longDescription": "This property shall contain the value at which the Reading property is above the normal range.  The value of the property shall use the same units as the Reading property."
                 },
+                "UpperCautionUser": {
+                    "$ref": "#/definitions/Threshold",
+                    "description": "The value at which the reading is above normal range.",
+                    "longDescription": "This property shall contain the value at which the Reading property is above the normal range.  The value of the property shall use the same units as the Reading property.",
+                    "versionAdded": "v1_2_0"
+                },
                 "UpperCritical": {
                     "$ref": "#/definitions/Threshold",
                     "description": "The value at which the reading is above normal range but not yet fatal.",
                     "longDescription": "This property shall contain the value at which the Reading property is above the normal range but is not yet fatal.  The value of the property shall use the same units as the Reading property."
                 },
+                "UpperCriticalUser": {
+                    "$ref": "#/definitions/Threshold",
+                    "description": "The value at which the reading is above normal range but not yet fatal.",
+                    "longDescription": "This property shall contain the value at which the Reading property is above the normal range but is not yet fatal.  The value of the property shall use the same units as the Reading property.",
+                    "versionAdded": "v1_2_0"
+                },
                 "UpperFatal": {
                     "$ref": "#/definitions/Threshold",
                     "description": "The value at which the reading is above normal range and fatal.",
@@ -1077,6 +1396,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.4",
-    "title": "#Sensor.v1_1_1.Sensor"
+    "release": "2020.4",
+    "title": "#Sensor.v1_2_0.Sensor"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/SessionService/SessionService.json b/static/redfish/v1/JsonSchemas/SessionService/SessionService.json
index 7c4f171..9d5f6ac 100644
--- a/static/redfish/v1/JsonSchemas/SessionService/SessionService.json
+++ b/static/redfish/v1/JsonSchemas/SessionService/SessionService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/SessionService.v1_1_7.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/SessionService.v1_1_8.json",
     "$ref": "#/definitions/SessionService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -155,5 +155,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2016.2",
-    "title": "#SessionService.v1_1_7.SessionService"
+    "title": "#SessionService.v1_1_8.SessionService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Settings/Settings.json b/static/redfish/v1/JsonSchemas/Settings/Settings.json
index aca27b4..eada112 100644
--- a/static/redfish/v1/JsonSchemas/Settings/Settings.json
+++ b/static/redfish/v1/JsonSchemas/Settings/Settings.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Settings.v1_3_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Settings.v1_3_3.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -13,7 +13,7 @@
             "enumDescriptions": {
                 "AtMaintenanceWindowStart": "Apply during a maintenance window as specified by an administrator.",
                 "Immediate": "Apply immediately.",
-                "InMaintenanceWindowOnReset": "Apply after a reset but within maintenance window as specified by an adminstrator.",
+                "InMaintenanceWindowOnReset": "Apply after a reset but within maintenance window as specified by an administrator.",
                 "OnReset": "Apply on a reset."
             },
             "enumLongDescriptions": {
@@ -247,5 +247,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.3",
-    "title": "#Settings.v1_3_2"
+    "title": "#Settings.v1_3_3"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Signature/Signature.json b/static/redfish/v1/JsonSchemas/Signature/Signature.json
index 58dffcb..681507a 100644
--- a/static/redfish/v1/JsonSchemas/Signature/Signature.json
+++ b/static/redfish/v1/JsonSchemas/Signature/Signature.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Signature.v1_0_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Signature.v1_0_2.json",
     "$ref": "#/definitions/Signature",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -114,7 +114,7 @@
                 },
                 "SignatureString": {
                     "description": "The string for the signature.",
-                    "longDescription": "This property shall contain the string of the signature, and the format shall follow the requirements specified by the value of the SignatureType property.  If the signature contains any private keys, they shall be removed from the string in reponses.  If the private key for the signature is not known by the service and is needed to use the signature, the client shall provide the private key as part of the string in the POST request.",
+                    "longDescription": "This property shall contain the string of the signature, and the format shall follow the requirements specified by the value of the SignatureType property.  If the signature contains any private keys, they shall be removed from the string in responses.  If the private key for the signature is not known by the service and is needed to use the signature, the client shall provide the private key as part of the string in the POST request.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -123,7 +123,7 @@
                 },
                 "SignatureType": {
                     "description": "The format of the signature.",
-                    "longDescription": "This property shall contain the format type for the signature.  The format is qualified by the value of the SignatureTypeRegisty property.",
+                    "longDescription": "This property shall contain the format type for the signature.  The format is qualified by the value of the SignatureTypeRegistry property.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -170,5 +170,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.1",
-    "title": "#Signature.v1_0_1.Signature"
+    "title": "#Signature.v1_0_2.Signature"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/SimpleStorage/SimpleStorage.json b/static/redfish/v1/JsonSchemas/SimpleStorage/SimpleStorage.json
index cfc8a5b..f58dc37 100644
--- a/static/redfish/v1/JsonSchemas/SimpleStorage/SimpleStorage.json
+++ b/static/redfish/v1/JsonSchemas/SimpleStorage/SimpleStorage.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/SimpleStorage.v1_3_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/SimpleStorage.v1_3_1.json",
     "$ref": "#/definitions/SimpleStorage",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -266,5 +266,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#SimpleStorage.v1_3_0.SimpleStorage"
+    "title": "#SimpleStorage.v1_3_1.SimpleStorage"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json b/static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json
index 903e613..58b4c25 100644
--- a/static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json
+++ b/static/redfish/v1/JsonSchemas/SoftwareInventory/SoftwareInventory.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.v1_3_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.v1_4_0.json",
     "$ref": "#/definitions/SoftwareInventory",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -31,6 +31,59 @@
             },
             "type": "object"
         },
+        "MeasurementBlock": {
+            "additionalProperties": false,
+            "description": "The DSP0274-defined measurement block information.",
+            "longDescription": "This type shall describe a DSP0274-defined measurement block.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Measurement": {
+                    "description": "The hexadecimal string representation of the numeric value of the DSP0274-defined Measurement field  of the measurement block.",
+                    "longDescription": "This property shall contain the value of the hexadecimal string representation of the numeric value of the DSP0274-defined Measurement field  of the measurement block.",
+                    "pattern": "^[0-9a-fA-F]+$",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
+                "MeasurementSize": {
+                    "description": "The DSP0274-defined MeasurementSize field of the measurement block.",
+                    "longDescription": "This property shall contain the value of DSP0274-defined MeasurementSize field of the measurement block.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
+                "MeasurementSpecification": {
+                    "description": "The DSP0274-defined MeasurementSpecification field of the measurement block.",
+                    "longDescription": "This property shall contain the value of DSP0274-defined MeasurementSpecification field of the measurement block.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                }
+            },
+            "type": "object"
+        },
         "OemActions": {
             "additionalProperties": true,
             "description": "The available OEM-specific actions for this Resource.",
@@ -123,6 +176,12 @@
                     ],
                     "versionAdded": "v1_2_0"
                 },
+                "Measurement": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock",
+                    "description": "A DSP0274-defined measurement block.",
+                    "longDescription": "This property shall contain a DSP0274-defined measurement block.",
+                    "versionAdded": "v1_4_0"
+                },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
                     "readonly": true
@@ -220,6 +279,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.1",
-    "title": "#SoftwareInventory.v1_3_0.SoftwareInventory"
+    "release": "2020.4",
+    "title": "#SoftwareInventory.v1_4_0.SoftwareInventory"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Storage/Storage.json b/static/redfish/v1/JsonSchemas/Storage/Storage.json
index 0cb3423..788622d 100644
--- a/static/redfish/v1/JsonSchemas/Storage/Storage.json
+++ b/static/redfish/v1/JsonSchemas/Storage/Storage.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_9_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_10_0.json",
     "$ref": "#/definitions/Storage",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -55,7 +55,7 @@
             "properties": {
                 "PersistentCacheSizeMiB": {
                     "description": "The portion of the cache memory that is persistent, measured in MiB.",
-                    "longDescription": "This property shall contain the amount of cache memory that is persistent as measured in mebibytes.  This size shall be less than or equal to the TotalCacheSizeMib.",
+                    "longDescription": "This property shall contain the amount of cache memory that is persistent as measured in mebibytes.  This size shall be less than or equal to the TotalCacheSizeMiB.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -489,6 +489,13 @@
                     "longDescription": "This property shall contain properties that describe the cache memory for this resource.",
                     "versionAdded": "v1_5_0"
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_10_0"
+                },
                 "ControllerRates": {
                     "$ref": "#/definitions/Rates",
                     "description": "This property describes the various controller rates used for processes such as volume rebuild or consistency checks.",
@@ -497,7 +504,7 @@
                 },
                 "FirmwareVersion": {
                     "description": "The firmware version of this storage controller.",
-                    "longDescription": "This property shall contain the firwmare version as defined by the manufacturer for the associated storage controller.",
+                    "longDescription": "This property shall contain the firmware version as defined by the manufacturer for the associated storage controller.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -533,6 +540,15 @@
                         "null"
                     ]
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_10_0"
+                },
                 "MemberId": {
                     "description": "The identifier for the member within the collection.",
                     "longDescription": "This property shall uniquely identify the member within the collection.  For services supporting Redfish v1.6 or higher, this value shall contain the zero-based array index.",
@@ -777,6 +793,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Storage.v1_9_0.Storage"
+    "release": "2020.4",
+    "title": "#Storage.v1_10_0.Storage"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/StorageController/StorageController.json b/static/redfish/v1/JsonSchemas/StorageController/StorageController.json
index 0bc6f2a..ce346b5 100644
--- a/static/redfish/v1/JsonSchemas/StorageController/StorageController.json
+++ b/static/redfish/v1/JsonSchemas/StorageController/StorageController.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/StorageController.v1_0_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/StorageController.v1_1_0.json",
     "$ref": "#/definitions/StorageController",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -8,7 +8,7 @@
             "enum": [
                 "Optimized",
                 "NonOptimized",
-                "Inacessible",
+                "Inaccessible",
                 "PersistentLoss"
             ],
             "enumDescriptions": {
@@ -108,7 +108,7 @@
             "properties": {
                 "PersistentCacheSizeMiB": {
                     "description": "The portion of the cache memory that is persistent, measured in MiB.",
-                    "longDescription": "This property shall contain the amount of cache memory that is persistent as measured in mebibytes.  This size shall be less than or equal to the TotalCacheSizeMib.",
+                    "longDescription": "This property shall contain the amount of cache memory that is persistent as measured in mebibytes.  This size shall be less than or equal to the TotalCacheSizeMiB.",
                     "minimum": 0,
                     "readonly": true,
                     "type": [
@@ -618,6 +618,13 @@
                     "description": "The cache memory of the storage controller in general detail.",
                     "longDescription": "This property shall contain properties that describe the cache memory for this resource."
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
                 "ControllerRates": {
                     "$ref": "#/definitions/Rates",
                     "description": "This property describes the various controller rates used for processes such as volume rebuild or consistency checks.",
@@ -636,7 +643,7 @@
                 },
                 "FirmwareVersion": {
                     "description": "The firmware version of this storage controller.",
-                    "longDescription": "This property shall contain the firwmare version as defined by the manufacturer for the associated storage controller.",
+                    "longDescription": "This property shall contain the firmware version as defined by the manufacturer for the associated storage controller.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -674,6 +681,15 @@
                         "null"
                     ]
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_1_0"
+                },
                 "Model": {
                     "description": "The model number for the storage controller.",
                     "longDescription": "This property shall contain the name by which the manufacturer generally refers to the storage controller.",
@@ -796,6 +812,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#StorageController.v1_0_0.StorageController"
+    "release": "2020.4",
+    "title": "#StorageController.v1_1_0.StorageController"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Switch/Switch.json b/static/redfish/v1/JsonSchemas/Switch/Switch.json
index 870bbdc..4452b95 100644
--- a/static/redfish/v1/JsonSchemas/Switch/Switch.json
+++ b/static/redfish/v1/JsonSchemas/Switch/Switch.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Switch.v1_4_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Switch.v1_5_0.json",
     "$ref": "#/definitions/Switch",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -210,6 +210,13 @@
                         "null"
                     ]
                 },
+                "Certificates": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/CertificateCollection.json#/definitions/CertificateCollection",
+                    "description": "The link to a collection of certificates for device identity and attestation.",
+                    "longDescription": "This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation.",
+                    "readonly": true,
+                    "versionAdded": "v1_5_0"
+                },
                 "CurrentBandwidthGbps": {
                     "description": "The current internal bandwidth of this switch.",
                     "longDescription": "This property shall contain the internal bandwidth of this switch currently negotiated and running.",
@@ -243,7 +250,7 @@
                 },
                 "FirmwareVersion": {
                     "description": "The firmware version of this switch.",
-                    "longDescription": "This property shall contain the firwmare version as defined by the manufacturer for the associated switch.",
+                    "longDescription": "This property shall contain the firmware version as defined by the manufacturer for the associated switch.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -326,6 +333,15 @@
                     "units": "Gbit/s",
                     "versionAdded": "v1_4_0"
                 },
+                "Measurements": {
+                    "description": "An array of DSP0274-defined measurement blocks.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/MeasurementBlock"
+                    },
+                    "longDescription": "This property shall contain an array of DSP0274-defined measurement blocks.",
+                    "type": "array",
+                    "versionAdded": "v1_5_0"
+                },
                 "Model": {
                     "description": "The product model number of this switch.",
                     "longDescription": "This property shall contain the manufacturer-provided model information of this switch.",
@@ -465,5 +481,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#Switch.v1_4_0.Switch"
+    "title": "#Switch.v1_5_0.Switch"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Task/Task.json b/static/redfish/v1/JsonSchemas/Task/Task.json
index 0d0a842..7cbd9a5 100644
--- a/static/redfish/v1/JsonSchemas/Task/Task.json
+++ b/static/redfish/v1/JsonSchemas/Task/Task.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Task.v1_5_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Task.v1_5_1.json",
     "$ref": "#/definitions/Task",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -287,7 +287,7 @@
             "enumLongDescriptions": {
                 "Cancelled": "This value shall represent that either a DELETE operation on a Task Monitor or Task Resource or by an internal process cancelled the task.",
                 "Cancelling": "This value shall represent that the task is in the process of being cancelled.",
-                "Completed": "This value shall represent that the task completed sucessfully or with warnings.",
+                "Completed": "This value shall represent that the task completed successfully or with warnings.",
                 "Exception": "This value shall represent that the task completed with errors.",
                 "Interrupted": "This value shall represent that the task has been interrupted but is expected to restart and is therefore not complete.",
                 "Killed": "This value shall represent that the task is complete because an operator killed it.",
@@ -311,5 +311,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2020.3",
-    "title": "#Task.v1_5_0.Task"
+    "title": "#Task.v1_5_1.Task"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/TaskService/TaskService.json b/static/redfish/v1/JsonSchemas/TaskService/TaskService.json
index ed7c3a4..0bfac44 100644
--- a/static/redfish/v1/JsonSchemas/TaskService/TaskService.json
+++ b/static/redfish/v1/JsonSchemas/TaskService/TaskService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/TaskService.v1_1_5.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/TaskService.v1_1_6.json",
     "$ref": "#/definitions/TaskService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -103,8 +103,8 @@
                 },
                 "CompletedTaskOverWritePolicy": {
                     "$ref": "#/definitions/OverWritePolicy",
-                    "description": "The overwrite policy for completed tasks.  This property indicates whether the task service overwrites completed task information.",
-                    "longDescription": "This property shall indicate how the task service shall handle completed tasks if the service must track more tasks.  This property indicates whether the task service overwrites completed task information.",
+                    "description": "The overwrite policy for completed tasks.  This property indicates if the task service overwrites completed task information.",
+                    "longDescription": "This property shall contain the overwrite policy for completed tasks.  This property shall indicate if the task service overwrites completed task information.",
                     "readonly": true
                 },
                 "DateTime": {
@@ -179,5 +179,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2017.1",
-    "title": "#TaskService.v1_1_5.TaskService"
+    "title": "#TaskService.v1_1_6.TaskService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json b/static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json
index b126bbf..e13252a 100644
--- a/static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json
+++ b/static/redfish/v1/JsonSchemas/TelemetryService/TelemetryService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/TelemetryService.v1_2_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/TelemetryService.v1_3_0.json",
     "$ref": "#/definitions/TelemetryService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -23,6 +23,15 @@
                 }
             },
             "properties": {
+                "#TelemetryService.ClearMetricReports": {
+                    "$ref": "#/definitions/ClearMetricReports"
+                },
+                "#TelemetryService.ResetMetricReportDefinitionsToDefaults": {
+                    "$ref": "#/definitions/ResetMetricReportDefinitionsToDefaults"
+                },
+                "#TelemetryService.ResetTriggersToDefaults": {
+                    "$ref": "#/definitions/ResetTriggersToDefaults"
+                },
                 "#TelemetryService.SubmitTestMetricReport": {
                     "$ref": "#/definitions/SubmitTestMetricReport"
                 },
@@ -34,6 +43,39 @@
             },
             "type": "object"
         },
+        "ClearMetricReports": {
+            "additionalProperties": false,
+            "description": "The action to clear the metric reports for this telemetry service.",
+            "longDescription": "This action shall delete all entries found in the metric report collection for this telemetry service.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
         "CollectionFunction": {
             "description": "An operation to perform over the sample.",
             "enum": [
@@ -143,6 +185,72 @@
             "properties": {},
             "type": "object"
         },
+        "ResetMetricReportDefinitionsToDefaults": {
+            "additionalProperties": false,
+            "description": "The action to reset the metric report definitions to factory defaults.",
+            "longDescription": "This action shall reset all entries found in the metric report definition collection to factory defaults.  This action might delete members of the metric report definition collection.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
+        "ResetTriggersToDefaults": {
+            "additionalProperties": false,
+            "description": "The action to reset the triggers to factory defaults.",
+            "longDescription": "This action shall reset all entries found in the triggers collection to factory defaults.  This action might delete members of the triggers collection.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_3_0"
+        },
         "SubmitTestMetricReport": {
             "additionalProperties": false,
             "description": "This action generates a metric report.",
@@ -350,6 +458,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.4",
-    "title": "#TelemetryService.v1_2_1.TelemetryService"
+    "release": "2020.4",
+    "title": "#TelemetryService.v1_3_0.TelemetryService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Thermal/Thermal.json b/static/redfish/v1/JsonSchemas/Thermal/Thermal.json
index a1f9108..1ddc261 100644
--- a/static/redfish/v1/JsonSchemas/Thermal/Thermal.json
+++ b/static/redfish/v1/JsonSchemas/Thermal/Thermal.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Thermal.v1_6_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Thermal.v1_7_0.json",
     "$ref": "#/definitions/Thermal",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -665,6 +665,7 @@
         },
         "Thermal": {
             "additionalProperties": false,
+            "deprecated": "This schema has been deprecated in favor of the ThermalSubsystem schema.",
             "description": "The Thermal schema describes temperature monitoring and thermal management subsystems, such as cooling fans, for a computer system or similar devices contained within a chassis.",
             "longDescription": "This resource shall contain the thermal management properties for temperature monitoring and management of cooling fans for a Redfish implementation.",
             "patternProperties": {
@@ -774,7 +775,8 @@
                 "Id",
                 "Name"
             ],
-            "type": "object"
+            "type": "object",
+            "versionDeprecated": "v1_7_0"
         },
         "ThermalActions": {
             "additionalProperties": false,
@@ -827,6 +829,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.4",
-    "title": "#Thermal.v1_6_2.Thermal"
+    "release": "2020.4",
+    "title": "#Thermal.v1_7_0.Thermal"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json b/static/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json
new file mode 100644
index 0000000..1e57bad
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json
@@ -0,0 +1,266 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalMetrics.v1_0_0.json",
+    "$ref": "#/definitions/ThermalMetrics",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "#ThermalMetrics.ResetMetrics": {
+                    "$ref": "#/definitions/ResetMetrics"
+                },
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "The available OEM-specific actions for this resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM-specific actions for this resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "ResetMetrics": {
+            "additionalProperties": false,
+            "description": "This action resets the summary metrics related to this equipment.",
+            "longDescription": "This action shall reset any time intervals or counted values for this equipment.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "TemperatureSummary": {
+            "additionalProperties": false,
+            "description": "The temperature sensors for a subsystem.",
+            "longDescription": "This type shall contain properties that describe temperature sensor for a subsystem.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Ambient": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The ambient temperature of this subsystem.",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the temperature reading for the ambient temperature of this subsystem.",
+                    "readonly": true
+                },
+                "Exhaust": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The exhaust temperature of this subsystem.",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the temperature reading for the exhaust temperature of this subsystem.",
+                    "readonly": true
+                },
+                "Intake": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The intake temperature of this subsystem.",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the temperature reading for the intake temperature of this subsystem.",
+                    "readonly": true
+                },
+                "Internal": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorExcerpt"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The internal temperature of this subsystem.",
+                    "excerptCopy": "SensorExcerpt",
+                    "longDescription": "This property shall contain the temperature reading for the internal temperature of this subsystem.",
+                    "readonly": true
+                }
+            },
+            "type": "object"
+        },
+        "ThermalMetrics": {
+            "additionalProperties": false,
+            "description": "The ThermalMetrics schema represents the thermal metrics of a chassis.",
+            "longDescription": "This resource shall represent the thermal metrics of a chassis for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "This property shall contain the available actions for this resource."
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "TemperatureReadingsCelsius": {
+                    "description": "The temperature readings from all related sensors for this device.",
+                    "excerptCopy": "SensorArrayExcerpt",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Sensor.json#/definitions/SensorArrayExcerpt"
+                    },
+                    "longDescription": "This property shall contain the temperature sensors for this subsystem.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "TemperatureReadingsCelsius@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "TemperatureSummaryCelsius": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/TemperatureSummary"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The summary temperature readings for this chassis.",
+                    "longDescription": "This property shall contain the temperature sensor readings for this subsystem."
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2020.4",
+    "title": "#ThermalMetrics.v1_0_0.ThermalMetrics"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ThermalMetrics/index.json b/static/redfish/v1/JsonSchemas/ThermalMetrics/index.json
new file mode 100644
index 0000000..9d7bfbb
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/ThermalMetrics/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+    "@odata.id": "/redfish/v1/JsonSchemas/ThermalMetrics",
+    "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+    "Name": "ThermalMetrics Schema File",
+    "Schema": "#ThermalMetrics.ThermalMetrics",
+    "Description": "ThermalMetrics Schema File Location",
+    "Id": "ThermalMetrics",
+    "Languages": [
+        "en"
+    ],
+    "Languages@odata.count": 1,
+    "Location": [
+        {
+            "Language": "en",
+            "PublicationUri": "http://redfish.dmtf.org/schemas/v1/ThermalMetrics.json",
+            "Uri": "/redfish/v1/JsonSchemas/ThermalMetrics/ThermalMetrics.json"
+        }
+    ],
+    "Location@odata.count": 1
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json b/static/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json
new file mode 100644
index 0000000..0b22bbd
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json
@@ -0,0 +1,153 @@
+{
+    "$id": "http://redfish.dmtf.org/schemas/v1/ThermalSubsystem.v1_0_0.json",
+    "$ref": "#/definitions/ThermalSubsystem",
+    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
+    "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "definitions": {
+        "Actions": {
+            "additionalProperties": false,
+            "description": "The available actions for this resource.",
+            "longDescription": "This type shall contain the available actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "Oem": {
+                    "$ref": "#/definitions/OemActions",
+                    "description": "This property contains the available OEM specific actions for this resource.",
+                    "longDescription": "This property shall contain any additional OEM actions for this resource."
+                }
+            },
+            "type": "object"
+        },
+        "OemActions": {
+            "additionalProperties": true,
+            "description": "The available OEM specific actions for this resource.",
+            "longDescription": "This type shall contain any additional OEM actions for this resource.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {},
+            "type": "object"
+        },
+        "ThermalSubsystem": {
+            "additionalProperties": false,
+            "description": "This ThermalSubsystem schema contains the definition for the thermal subsystem of a chassis.",
+            "longDescription": "This resource shall represent a thermal subsystem for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "@odata.context": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
+                },
+                "@odata.etag": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
+                },
+                "@odata.id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
+                },
+                "@odata.type": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
+                },
+                "Actions": {
+                    "$ref": "#/definitions/Actions",
+                    "description": "The available actions for this resource.",
+                    "longDescription": "The Actions property shall contain the available actions for this resource."
+                },
+                "Description": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "readonly": true
+                },
+                "FanRedundancy": {
+                    "description": "The redundancy information for the groups of fans in this subsystem.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Redundancy.json#/definitions/RedundantGroup"
+                    },
+                    "longDescription": "This property shall contain redundancy information for the groups of fans in this subsystem.",
+                    "type": "array"
+                },
+                "Fans": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/FanCollection.json#/definitions/FanCollection",
+                    "description": "The link to the collection of fans within this subsystem.",
+                    "longDescription": "This property shall contain a link to a resource collection of type FanCollection.",
+                    "readonly": true
+                },
+                "Id": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
+                    "readonly": true
+                },
+                "Name": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
+                    "readonly": true
+                },
+                "Oem": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the resource and its subordinate or dependent resources.",
+                    "longDescription": "This property shall contain any status or health properties of the resource."
+                },
+                "ThermalMetrics": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/ThermalMetrics.json#/definitions/ThermalMetrics",
+                    "description": "The link to the summary of thermal metrics for this subsystem.",
+                    "longDescription": "This property shall contain a link to a resource collection of type ThermalMetrics.",
+                    "readonly": true
+                }
+            },
+            "required": [
+                "@odata.id",
+                "@odata.type",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        }
+    },
+    "owningEntity": "DMTF",
+    "release": "2020.4",
+    "title": "#ThermalSubsystem.v1_0_0.ThermalSubsystem"
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ThermalSubsystem/index.json b/static/redfish/v1/JsonSchemas/ThermalSubsystem/index.json
new file mode 100644
index 0000000..373dc14
--- /dev/null
+++ b/static/redfish/v1/JsonSchemas/ThermalSubsystem/index.json
@@ -0,0 +1,21 @@
+{
+    "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile",
+    "@odata.id": "/redfish/v1/JsonSchemas/ThermalSubsystem",
+    "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile",
+    "Name": "ThermalSubsystem Schema File",
+    "Schema": "#ThermalSubsystem.ThermalSubsystem",
+    "Description": "ThermalSubsystem Schema File Location",
+    "Id": "ThermalSubsystem",
+    "Languages": [
+        "en"
+    ],
+    "Languages@odata.count": 1,
+    "Location": [
+        {
+            "Language": "en",
+            "PublicationUri": "http://redfish.dmtf.org/schemas/v1/ThermalSubsystem.json",
+            "Uri": "/redfish/v1/JsonSchemas/ThermalSubsystem/ThermalSubsystem.json"
+        }
+    ],
+    "Location@odata.count": 1
+}
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Triggers/Triggers.json b/static/redfish/v1/JsonSchemas/Triggers/Triggers.json
index a29c436..726481d 100644
--- a/static/redfish/v1/JsonSchemas/Triggers/Triggers.json
+++ b/static/redfish/v1/JsonSchemas/Triggers/Triggers.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Triggers.v1_1_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Triggers.v1_1_3.json",
     "$ref": "#/definitions/Triggers",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -65,7 +65,7 @@
             "properties": {
                 "DwellTime": {
                     "description": "The amount of time that a trigger event persists before the metric action is performed.",
-                    "longDescription": "This property shall contain the amount of time that a trigger event persists before the MetricAction is performed.",
+                    "longDescription": "This property shall contain the amount of time that a trigger event persists before the TriggerActions are performed.",
                     "pattern": "-?P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?",
                     "readonly": false,
                     "type": [
@@ -228,7 +228,7 @@
                 },
                 "DwellTime": {
                     "description": "The duration the sensor value must violate the threshold before the threshold is activated.",
-                    "longDescription": "This property shall indicate the duration the sensor value must violate the threshold before the threshold is activated.",
+                    "longDescription": "This property shall indicate the duration the sensor value violates the threshold before the threshold is activated.",
                     "pattern": "-?P(\\d+D)?(T(\\d+H)?(\\d+M)?(\\d+(.\\d+)?S)?)?",
                     "readonly": false,
                     "type": [
@@ -540,5 +540,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.1",
-    "title": "#Triggers.v1_1_2.Triggers"
+    "title": "#Triggers.v1_1_3.Triggers"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json b/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
index 9fda954..2d3eb87 100644
--- a/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
+++ b/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_8_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_8_3.json",
     "$ref": "#/definitions/UpdateService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -86,7 +86,7 @@
                 },
                 "MaintenanceWindowDurationInSeconds": {
                     "description": "The expiry time, in seconds, of the maintenance window.",
-                    "longDescription": "This property shall indicate the end of the maintenance window as the number of seconds after the time specified by the HttpPushUriMaintenanceWindowStartTime property.  This property shall contain required if the HttpPushUriApplyTime property value is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`.",
+                    "longDescription": "This property shall indicate the end of the maintenance window as the number of seconds after the time specified by the MaintenanceWindowStartTime property.  This property shall be required if the HttpPushUriApplyTime property value is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`.",
                     "minimum": 0,
                     "readonly": false,
                     "type": "integer",
@@ -96,7 +96,7 @@
                 "MaintenanceWindowStartTime": {
                     "description": "The start time of a maintenance window.",
                     "format": "date-time",
-                    "longDescription": "This property shall indicate the date and time when the service can start to apply the HttpPushUri-provided software as part of a maintenance window.  This property shall contain required if the HttpPushUriApplyTime property value is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`.",
+                    "longDescription": "This property shall indicate the date and time when the service can start to apply the HttpPushUri-provided software as part of a maintenance window.  This property shall be required if the HttpPushUriApplyTime property value is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`.",
                     "readonly": false,
                     "type": "string",
                     "versionAdded": "v1_4_0"
@@ -183,7 +183,7 @@
                 "TransferProtocol": {
                     "$ref": "#/definitions/TransferProtocolType",
                     "description": "The network protocol that the update service uses to retrieve the software image file located at the URI provided in ImageURI.  This parameter is ignored if the URI provided in ImageURI contains a scheme.",
-                    "longDescription": "This parameter shall contain the network protocol that the update service shall use to retreive the software image located at the ImageURI.  Services should ignore this parameter if the URI provided in ImageURI contains a scheme.  If this parameter is not provided (or supported), and a transfer protocol is not specified by a scheme contained within this URI, the service shall use HTTP to retrieve the image."
+                    "longDescription": "This parameter shall contain the network protocol that the update service shall use to retrieve the software image located at the ImageURI.  Services should ignore this parameter if the URI provided in ImageURI contains a scheme.  If this parameter is not provided (or supported), and a transfer protocol is not specified by a scheme contained within this URI, the service shall use HTTP to retrieve the image."
                 },
                 "Username": {
                     "description": "The user name to access the URI specified by the ImageURI parameter.",
@@ -496,5 +496,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2019.4",
-    "title": "#UpdateService.v1_8_2.UpdateService"
+    "title": "#UpdateService.v1_8_3.UpdateService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/VLanNetworkInterface/VLanNetworkInterface.json b/static/redfish/v1/JsonSchemas/VLanNetworkInterface/VLanNetworkInterface.json
index 51ed26d..2d5c5f4 100644
--- a/static/redfish/v1/JsonSchemas/VLanNetworkInterface/VLanNetworkInterface.json
+++ b/static/redfish/v1/JsonSchemas/VLanNetworkInterface/VLanNetworkInterface.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/VLanNetworkInterface.v1_1_5.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/VLanNetworkInterface.v1_2_0.json",
     "$ref": "#/definitions/VLanNetworkInterface",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -93,6 +93,20 @@
                     "description": "The ID for this VLAN.",
                     "longDescription": "This property shall contain the ID for this VLAN.",
                     "readonly": false
+                },
+                "VLANPriority": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/VLANPriority"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The priority for this VLAN.",
+                    "longDescription": "This property shall contain the priority for this VLAN.",
+                    "readonly": false,
+                    "versionAdded": "v1_2_0"
                 }
             },
             "requiredOnCreate": [
@@ -106,6 +120,11 @@
             "minimum": 0,
             "type": "integer"
         },
+        "VLANPriority": {
+            "maximum": 7,
+            "minimum": 0,
+            "type": "integer"
+        },
         "VLanNetworkInterface": {
             "additionalProperties": false,
             "description": "The VLanNetworkInterface schema describes a VLAN network instance that is available on a manager, system, or other device.",
@@ -188,6 +207,20 @@
                     "description": "The ID for this VLAN.",
                     "longDescription": "This property shall contain the ID for this VLAN.",
                     "readonly": false
+                },
+                "VLANPriority": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/VLANPriority"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The priority for this VLAN.",
+                    "longDescription": "This property shall contain the priority for this VLAN.",
+                    "readonly": false,
+                    "versionAdded": "v1_2_0"
                 }
             },
             "required": [
@@ -204,6 +237,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2017.1",
-    "title": "#VLanNetworkInterface.v1_1_5.VLanNetworkInterface"
+    "release": "2020.4",
+    "title": "#VLanNetworkInterface.v1_2_0.VLanNetworkInterface"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Volume/Volume.json b/static/redfish/v1/JsonSchemas/Volume/Volume.json
index 3c19a23..32ef77c 100644
--- a/static/redfish/v1/JsonSchemas/Volume/Volume.json
+++ b/static/redfish/v1/JsonSchemas/Volume/Volume.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.v1_5_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.v1_6_1.json",
     "$ref": "#/definitions/Volume",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2016-2019 Storage Networking Industry Association (SNIA), USA. All rights reserved. For the full SNIA copyright policy, see http://www.snia.org/about/corporate_info/copyright",
+    "copyright": "Copyright 2016-2020 Storage Networking Industry Association (SNIA), USA. All rights reserved. For the full SNIA copyright policy, see http://www.snia.org/about/corporate_info/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -293,8 +293,8 @@
         },
         "Initialize": {
             "additionalProperties": false,
-            "description": "This action is used to prepare the contents of the volume for use by the system. If InitializeMethod is not specified in the request body, the InitializeMethod should be Foreground.",
-            "longDescription": "This defines the name of the custom action supported on this resource. If InitializeMethod is not specified in the request body, the InitializeMethod should be Foreground.",
+            "description": "This action is used to prepare the contents of the volume for use by the system. If InitializeMethod is not specified in the request body, but the property InitializeMethod is specified, the property InitializeMethod value should be used. If neither is specified, the InitializeMethod should be Foreground.",
+            "longDescription": "This defines the name of the custom action supported on this resource. If InitializeMethod is not specified in the request body, but the property InitializeMethod is specified, the property InitializeMethod value should be used. If neither is specified, the InitializeMethod should be Foreground.",
             "parameters": {
                 "InitializeMethod": {
                     "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.json#/definitions/InitializeMethod",
@@ -354,6 +354,33 @@
                 }
             },
             "properties": {
+                "CacheDataVolumes": {
+                    "description": "A pointer to the data volumes this volume serves as a cache volume.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.json#/definitions/Volume"
+                    },
+                    "longDescription": "This shall be a pointer to the cache data volumes this volume serves as a cache volume.  The corresponding VolumeUsage property shall be set to CacheOnly when this property is used.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_6_0"
+                },
+                "CacheDataVolumes@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
+                "CacheVolumeSource": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.json#/definitions/Volume"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "A pointer to the cache volume source for this volume.",
+                    "longDescription": "This shall be a pointer to the cache volume source for this volume. The corresponding VolumeUsage property shall be set to Data when this property is used.",
+                    "readonly": true,
+                    "versionAdded": "v1_6_0"
+                },
                 "ClassOfService": {
                     "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/ClassOfService.json#/definitions/ClassOfService",
                     "description": "The ClassOfService that this storage volume conforms to.",
@@ -372,7 +399,7 @@
                     "versionAdded": "v1_4_0"
                 },
                 "ClientEndpoints@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "ConsistencyGroups": {
                     "description": "An array of references to the ConsistencyGroups associated with this volume.",
@@ -385,7 +412,7 @@
                     "versionAdded": "v1_4_0"
                 },
                 "ConsistencyGroups@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "DedicatedSpareDrives": {
                     "description": "An array of references to the drives which are dedicated spares for this volume.",
@@ -393,12 +420,12 @@
                         "$ref": "http://redfish.dmtf.org/schemas/v1/Drive.json#/definitions/Drive"
                     },
                     "longDescription": "The value of this property shall be a reference to the resources that this volume is associated with and shall reference resources of type Drive. This property shall only contain references to Drive entities which are currently assigned as a dedicated spare and are able to support this Volume.",
-                    "readonly": true,
+                    "readonly": false,
                     "type": "array",
                     "versionAdded": "v1_2_0"
                 },
                 "DedicatedSpareDrives@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "Drives": {
                     "description": "An array of references to the drives which contain this volume. This will reference Drives that either wholly or only partly contain this volume.",
@@ -410,7 +437,7 @@
                     "type": "array"
                 },
                 "Drives@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "JournalingMedia": {
                     "anyOf": [
@@ -456,7 +483,7 @@
                     "versionAdded": "v1_4_0"
                 },
                 "ServerEndpoints@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "SpareResourceSets": {
                     "description": "An array of references to SpareResourceSets.",
@@ -469,7 +496,7 @@
                     "versionAdded": "v1_3_0"
                 },
                 "SpareResourceSets@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "StorageGroups": {
                     "description": "An array of references to the StorageGroups associated with this volume.",
@@ -482,7 +509,7 @@
                     "versionAdded": "v1_4_0"
                 },
                 "StorageGroups@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 }
             },
             "type": "object"
@@ -623,8 +650,8 @@
                     "versionAdded": "v1_5_0"
                 },
                 "SupportsIOPerformanceHints": {
-                    "description": "Indicates that the Namepsace Atomic Write Unit Normal (NAWUN), Namespace Atomic Write Unit Power Fail (NAWUPF), and Namespace Atomic Compare and Write Unit (NACWU) fields are defined for this namespace and should be used by the host for this namespace instead of the controller-level properties AWUN, AWUPF, and ACWU.",
-                    "longDescription": "This property shall indicate that the Namepsace Atomic Write Unit Normal (NAWUN), Namespace Atomic Write Unit Power Fail (NAWUPF), and Namespace Atomic Compare and Write Unit (NACWU) fields are defined for this namespace and should be used by the host for this namespace instead of the controller-level properties AWUN, AWUPF, and ACWU.",
+                    "description": "Indicates that the Namespace Atomic Write Unit Normal (NAWUN), Namespace Atomic Write Unit Power Fail (NAWUPF), and Namespace Atomic Compare and Write Unit (NACWU) fields are defined for this namespace and should be used by the host for this namespace instead of the controller-level properties AWUN, AWUPF, and ACWU.",
+                    "longDescription": "This property shall indicate that the Namespace Atomic Write Unit Normal (NAWUN), Namespace Atomic Write Unit Power Fail (NAWUPF), and Namespace Atomic Compare and Write Unit (NACWU) fields are defined for this namespace and should be used by the host for this namespace instead of the controller-level properties AWUN, AWUPF, and ACWU.",
                     "readonly": true,
                     "type": [
                         "boolean",
@@ -940,16 +967,16 @@
             },
             "properties": {
                 "@odata.context": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/context"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
                 },
                 "@odata.etag": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/etag"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
                 },
                 "@odata.id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
                 },
                 "@odata.type": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/type"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
                 },
                 "AccessCapabilities": {
                     "description": "Supported IO access capabilities.",
@@ -1018,7 +1045,7 @@
                     "versionAdded": "v1_1_0"
                 },
                 "CapacitySources@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "Compressed": {
                     "description": "Indicator of whether or not the Volume has compression enabled.",
@@ -1107,6 +1134,20 @@
                     "longDescription": "This property shall contain a list of all known durable names for the associated volume.",
                     "type": "array"
                 },
+                "InitializeMethod": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.json#/definitions/InitializeMethod"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Indicates the Initialization Method used for this volume. If InitializeMethod is not specified, the InitializeMethod should be Foreground.",
+                    "longDescription": "This property shall indicate the initiatialization method used for this volume. If InitializeMethod is not specified, the InitializeMethod should be Foreground. This value reflects the most recently used Initialization Method, and may be changed using the Initialize Action.",
+                    "readonly": true,
+                    "versionAdded": "v1_6_0"
+                },
                 "Links": {
                     "$ref": "#/definitions/Links",
                     "description": "Contains references to other resources that are related to this resource.",
@@ -1288,7 +1329,7 @@
                 "ReplicaTargets": {
                     "description": "The resources that are target replicas of this source.",
                     "items": {
-                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/idRef"
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/idRef"
                     },
                     "longDescription": "The value shall reference the target replicas that are sourced by this replica.",
                     "readonly": true,
@@ -1296,7 +1337,7 @@
                     "versionAdded": "v1_3_0"
                 },
                 "ReplicaTargets@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
@@ -1395,6 +1436,6 @@
         }
     },
     "owningEntity": "SNIA",
-    "release": "WIP v1.2.0",
-    "title": "#Volume.v1_5_0.Volume"
+    "release": "TP v1.2.1",
+    "title": "#Volume.v1_6_1.Volume"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Zone/Zone.json b/static/redfish/v1/JsonSchemas/Zone/Zone.json
index 373701c..66877d0 100644
--- a/static/redfish/v1/JsonSchemas/Zone/Zone.json
+++ b/static/redfish/v1/JsonSchemas/Zone/Zone.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Zone.v1_5_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Zone.v1_6_0.json",
     "$ref": "#/definitions/Zone",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -414,22 +414,28 @@
             "enum": [
                 "Default",
                 "ZoneOfEndpoints",
-                "ZoneOfZones"
+                "ZoneOfZones",
+                "ZoneOfResourceBlocks"
             ],
             "enumDescriptions": {
                 "Default": "The zone in which all endpoints are added by default when instantiated.",
                 "ZoneOfEndpoints": "A zone that contains endpoints.",
+                "ZoneOfResourceBlocks": "A zone that contains resource blocks.",
                 "ZoneOfZones": "A zone that contains zones."
             },
             "enumLongDescriptions": {
-                "Default": "This value shall indicate a zone in which all endpoints are added by default when instantiated.",
-                "ZoneOfEndpoints": "This value shall indicate a zone that contains resources of type Endpoint.",
-                "ZoneOfZones": "This value shall indicate a zone that contains resources of type Zone."
+                "Default": "This value shall indicate a zone in which all endpoints are added by default when instantiated.  This value shall only be used for zones subordinate to the fabric collection.",
+                "ZoneOfEndpoints": "This value shall indicate a zone that contains resources of type Endpoint.  This value shall only be used for zones subordinate to the fabric collection.",
+                "ZoneOfResourceBlocks": "This value shall indicate a zone that contains resources of type ResourceBlock.  This value shall only be used for zones subordinate to the composition service.",
+                "ZoneOfZones": "This value shall indicate a zone that contains resources of type Zone.  This value shall only be used for zones subordinate to the fabric collection."
+            },
+            "enumVersionAdded": {
+                "ZoneOfResourceBlocks": "v1_6_0"
             },
             "type": "string"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.3",
-    "title": "#Zone.v1_5_0.Zone"
+    "release": "2020.4",
+    "title": "#Zone.v1_6_0.Zone"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/index.json b/static/redfish/v1/JsonSchemas/index.json
index c6d6833..aa9e309 100644
--- a/static/redfish/v1/JsonSchemas/index.json
+++ b/static/redfish/v1/JsonSchemas/index.json
@@ -4,7 +4,7 @@
   "@odata.type": "#JsonSchemaFileCollection.JsonSchemaFileCollection",
   "Name": "JsonSchemaFile Collection",
   "Description": "Collection of JsonSchemaFiles",
-  "Members@odata.count": 111,
+  "Members@odata.count": 118,
   "Members": [
     {
       "@odata.id": "/redfish/v1/JsonSchemas/AccelerationFunction"
@@ -79,6 +79,9 @@
       "@odata.id": "/redfish/v1/JsonSchemas/EndpointGroup"
     },
     {
+      "@odata.id": "/redfish/v1/JsonSchemas/EnvironmentMetrics"
+    },
+    {
       "@odata.id": "/redfish/v1/JsonSchemas/EthernetInterface"
     },
     {
@@ -103,6 +106,9 @@
       "@odata.id": "/redfish/v1/JsonSchemas/Facility"
     },
     {
+      "@odata.id": "/redfish/v1/JsonSchemas/Fan"
+    },
+    {
       "@odata.id": "/redfish/v1/JsonSchemas/HostInterface"
     },
     {
@@ -220,6 +226,15 @@
       "@odata.id": "/redfish/v1/JsonSchemas/PowerEquipment"
     },
     {
+      "@odata.id": "/redfish/v1/JsonSchemas/PowerSubsystem"
+    },
+    {
+      "@odata.id": "/redfish/v1/JsonSchemas/PowerSupply"
+    },
+    {
+      "@odata.id": "/redfish/v1/JsonSchemas/PowerSupplyMetrics"
+    },
+    {
       "@odata.id": "/redfish/v1/JsonSchemas/PrivilegeRegistry"
     },
     {
@@ -307,6 +322,12 @@
       "@odata.id": "/redfish/v1/JsonSchemas/Thermal"
     },
     {
+      "@odata.id": "/redfish/v1/JsonSchemas/ThermalMetrics"
+    },
+    {
+      "@odata.id": "/redfish/v1/JsonSchemas/ThermalSubsystem"
+    },
+    {
       "@odata.id": "/redfish/v1/JsonSchemas/Triggers"
     },
     {
diff --git a/static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json b/static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json
index ab3c143..10eda3f 100644
--- a/static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json
+++ b/static/redfish/v1/JsonSchemas/redfish-schema/redfish-schema.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_7_0",
+    "$id": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_8_0",
     "type": "object",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "title": "Redfish Schema Extension",
@@ -130,6 +130,16 @@
         "license": {
             "type": "string",
             "description": "The term is applied to Redfish schema or registry in order to specify licensing information."
+        },
+        "releaseStatus": {
+            "enum": [
+                "Standard",
+                "Informational",
+                "WorkInProgress",
+                "InDevelopment"
+            ],
+            "type": "string",
+            "description": "The term specifies the public release status of a property or schema."
         }
     },
     "properties": {
@@ -221,12 +231,15 @@
         },
         "enumTranslations": {
             "$ref": "#/definitions/enumTranslations"
-        },
+        },  
         "actionResponse": {
             "$ref": "#/definitions/actionResponse"
         },
         "license": {
             "$ref": "#/definitions/license"
+        },
+        "releaseStatus": {
+            "$ref": "#/definitions/releaseStatus"
         }
     }
 }
diff --git a/static/redfish/v1/schema/AccelerationFunction_v1.xml b/static/redfish/v1/schema/AccelerationFunction_v1.xml
index cb474cb..fd7d11a 100644
--- a/static/redfish/v1/schema/AccelerationFunction_v1.xml
+++ b/static/redfish/v1/schema/AccelerationFunction_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AccelerationFunction v1.0.2                                         -->
+<!--# Redfish Schema:  AccelerationFunction v1.0.3                                         -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -193,5 +193,11 @@
       <EntityType Name="AccelerationFunction" BaseType="AccelerationFunction.v1_0_1.AccelerationFunction"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccelerationFunction.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AccelerationFunction" BaseType="AccelerationFunction.v1_0_2.AccelerationFunction"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/AccountService_v1.xml b/static/redfish/v1/schema/AccountService_v1.xml
index 9c40422..ef5d943 100644
--- a/static/redfish/v1/schema/AccountService_v1.xml
+++ b/static/redfish/v1/schema/AccountService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AccountService v1.7.2                                               -->
+<!--# Redfish Schema:  AccountService v1.8.0                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -43,6 +43,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
     <edmx:Include Namespace="CertificateCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Privileges_v1.xml">
+    <edmx:Include Namespace="Privileges"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ManagerAccount_v1.xml">
+    <edmx:Include Namespace="ManagerAccount"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -118,7 +124,7 @@
         <Property Name="AccountLockoutDuration" Type="Edm.Int64" Nullable="true">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The period of time, in seconds, that an account is locked after the number of failed login attempts reaches the account lockout threshold, within the period between the last failed login attempt and the reset of the lockout threshold counter.  If this value is `0`, no lockout will occur.  If the AccountLockoutCounterResetEnabled value is `false`, this property is ignored."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the period of time, in seconds, that an account is locked after the number of failed login attempts reaches the AccountLockoutThreshold value, within the AccountLockoutCounterResetAfter window of time.  The value shall be greater than or equal to the AccountLockoutResetAfter value.  If this value is `0`, no lockout shall occur.  If AccountLockoutCounterResetEnabled value is `false`, this property shall be ignored."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the period of time, in seconds, that an account is locked after the number of failed login attempts reaches the AccountLockoutThreshold value, within the AccountLockoutCounterResetAfter window of time.  The value shall be greater than or equal to the AccountLockoutCounterResetAfter value.  If this value is `0`, no lockout shall occur.  If AccountLockoutCounterResetEnabled value is `false`, this property shall be ignored."/>
           <Annotation Term="Validation.Minimum" Int="0"/>
           <Annotation Term="Measures.Unit" String="s"/>
         </Property>
@@ -198,6 +204,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_0_9.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_0_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_0_10.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -254,6 +266,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_1_6.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_1_7.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -324,6 +342,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_2_6.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_2_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_2_7.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -420,11 +444,11 @@
       <EnumType Name="AccountProviderTypes">
         <Member Name="RedfishService">
           <Annotation Term="OData.Description" String="An external Redfish service."/>
-          <Annotation Term="OData.LongDescription" String="The external account provider shall be a DMTF Redfish Specification-comformant service.  The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service."/>
+          <Annotation Term="OData.LongDescription" String="The external account provider shall be a DMTF Redfish Specification-conformant service.  The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service."/>
         </Member>
         <Member Name="ActiveDirectoryService">
           <Annotation Term="OData.Description" String="An external Active Directory service."/>
-          <Annotation Term="OData.LongDescription" String="The external account provider shall be a Microsoft Active Directory Technical Specification-comformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service."/>
+          <Annotation Term="OData.LongDescription" String="The external account provider shall be a Microsoft Active Directory Technical Specification-conformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service."/>
         </Member>
         <Member Name="LDAPService">
           <Annotation Term="OData.Description" String="A generic external LDAP service."/>
@@ -433,6 +457,18 @@
         <Member Name="OEM">
           <Annotation Term="OData.Description" String="An OEM-specific external authentication or directory service."/>
         </Member>
+        <Member Name="TACACSplus">
+          <Annotation Term="OData.Description" String="An external TACACS+ service."/>
+          <Annotation Term="OData.LongDescription" String="The external account provider shall be an RFC8907-conformant service.  The ServiceAddresses format shall contain a set of host:port that correspond to a TACACS+ service and where the format for host and port are defined in RFC3986."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_8_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <ComplexType Name="Authentication">
@@ -577,6 +613,18 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_3_4.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_3_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_3_5.AccountService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_3_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_3_6.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -617,6 +665,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_4_3.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_4_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_4_4.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -649,10 +703,16 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_5_2.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_5_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_5_3.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
-      <Annotation Term="OData.Description" String="This version was created to add LocalFirst to the LocalAccountAuth enum."/>
+      <Annotation Term="OData.Description" String="This version was created to add LocalFirst to the LocalAccountAuth enumeration."/>
 
       <EntityType Name="AccountService" BaseType="AccountService.v1_5_1.AccountService"/>
     </Schema>
@@ -669,6 +729,12 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_6_1.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_6_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_6_2.AccountService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -696,5 +762,110 @@
       <EntityType Name="AccountService" BaseType="AccountService.v1_7_1.AccountService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="AccountService" BaseType="AccountService.v1_7_2.AccountService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AccountService.v1_8_0">
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add TACACS+ support and SupportedAccountTypes."/>
+
+      <EntityType Name="AccountService" BaseType="AccountService.v1_7_3.AccountService">
+        <Property Name="TACACSplus" Type="AccountService.v1_8_0.ExternalAccountProvider">
+          <Annotation Term="OData.Description" String="The first TACACS+ external account provider that this account service supports."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the first TACACS+ external account provider that this account service supports.  If the account service supports one or more TACACS+ services as an external account provider, this entity shall be populated by default.  This entity shall not be present in the additional external account providers resource collection."/>
+        </Property>        
+        <Property Name="SupportedAccountTypes" Type="Collection(ManagerAccount.AccountTypes)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The account types supported by the service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the account types supported by the service."/>
+        </Property>
+        <Property Name="SupportedOEMAccountTypes" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The OEM account types supported by the service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the OEM account types supported by the service."/>
+        </Property>
+        <Property Name="RestrictedPrivileges" Type="Collection(Privileges.PrivilegeType)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The set of restricted Redfish privileges."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of Redfish privileges that are restricted by the service."/>
+        </Property>
+        <Property Name="RestrictedOemPrivileges" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The set of restricted OEM privileges."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of OEM privileges that are restricted by the service."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="ExternalAccountProvider" BaseType="AccountService.v1_7_0.ExternalAccountProvider">
+        <Property Name="TACACSplusService" Type="AccountService.v1_8_0.TACACSplusService">
+          <Annotation Term="OData.Description" String="The additional information needed to parse a TACACS+ services."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain additional information needed to parse a TACACS+ services. This property should only be present inside a TACACSplus property."/>
+        </Property>
+        <Property Name="Priority" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The authentication priority for the external account provider."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the assigned priority for the specified external account provider.  The value `0` value shall indicate the highest priority.  Increasing values shall represent decreasing priority.  If an external provider does not have a priority assignment or two or more external providers have the same priority, the behavior shall be determined by the Redfish service.  The priority is used to determine the order of authentication and authorization for each external account provider."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="Authentication" BaseType="AccountService.v1_3_0.Authentication">
+        <Property Name="EncryptionKey" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Specifies the encryption key."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value of a symmetric encryption key for account services that support some form of encryption, obfuscation, or authentication such as TACACS+.  The value shall be `null` in responses.  The property shall accept a hexadecimal string whose length depends on the external account service, such as TACACS+.  A TACACS+ service shall use this property to specify the secret key as defined in RFC8907."/>
+          <Annotation Term="Validation.Pattern" String="^[0-9a-fA-F]+$"/>
+        </Property>
+       <Property Name="EncryptionKeySet" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates if the EncryptionKey property is set."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain `true` if a valid value was provided for the EncryptionKey property.  Otherwise, the property shall contain `false`.  For a TACACS+ service, the value `false` shall indicate data obfuscation, as defined in section 4.5 of RFC8907, is disabled."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="TACACSplusService">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="Various settings to parse a TACACS+ service."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain settings for parsing a TACACS+ service."/>
+        <Property Name="PrivilegeLevelArgument" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the name of the TACACS+ argument name in an authorization request."/>
+          <Annotation Term="OData.LongDescription" String="This property shall specify the name of the argument in a TACACS+ Authorization REPLY packet body, as defined in RFC8907, that contains the user's privilege level."/>
+        </Property>
+        <Property Name="PasswordExchangeProtocols" Type="Collection(AccountService.v1_8_0.TACACSplusPasswordExchangeProtocol)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the allowed TACACS+ password exchange protocols."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate all the allowed TACACS+ password exchange protocol described under section 5.4.2 of RFC8907."/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="TACACSplusPasswordExchangeProtocol">
+        <Member Name="ASCII">
+          <Annotation Term="OData.Description" String="The ASCII Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the ASCII Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+        <Member Name="PAP">
+          <Annotation Term="OData.Description" String="The PAP Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the PAP Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+        <Member Name="CHAP">
+          <Annotation Term="OData.Description" String="The CHAP Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the CHAP Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+        <Member Name="MSCHAPv1">
+          <Annotation Term="OData.Description" String="The MS-CHAP v1 Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the MS-CHAP v1 Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+        <Member Name="MSCHAPv2">
+          <Annotation Term="OData.Description" String="The MS-CHAP v2 Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the MS-CHAP v2 Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/AddressPool_v1.xml b/static/redfish/v1/schema/AddressPool_v1.xml
index d48a70e..a10ecb2 100644
--- a/static/redfish/v1/schema/AddressPool_v1.xml
+++ b/static/redfish/v1/schema/AddressPool_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AddressPool v1.1.0                                                  -->
+<!--# Redfish Schema:  AddressPool v1.1.1                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -167,6 +167,12 @@
       <EntityType Name="AddressPool" BaseType="AddressPool.v1_0_0.AddressPool"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AddressPool.v1_0_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="AddressPool" BaseType="AddressPool.v1_0_1.AddressPool"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AddressPool.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to add Ethernet address pool definitions and update permissions for Endpoints and Zones."/>
@@ -192,16 +198,16 @@
           <Annotation Term="OData.LongDescription" String="This property shall contain the BGP Ethernet Virtual Private Network (EVPN) related properties for this Ethernet fabric."/>
         </Property>
         <Property Name="EBGP" Type="AddressPool.v1_1_0.EBGP">
-          <Annotation Term="OData.Description" String="External BGP (EBGP) related properties for this Ethernet fabric."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the External BGP (EBGP) related properties for this Ethernet fabric."/>
+          <Annotation Term="OData.Description" String="External BGP (eBGP) related properties for this Ethernet fabric."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the External BGP (eBGP) related properties for this Ethernet fabric."/>
         </Property>
         <Property Name="MultiProtocolIBGP" Type="AddressPool.v1_1_0.CommonBGPProperties">
-          <Annotation Term="OData.Description" String="Multi Protocol IBGP (MP IBGP) related properties for this Ethernet fabric."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the Multi Protocol IBGP (MP IBGP) related properties for this Ethernet fabric."/>
+          <Annotation Term="OData.Description" String="Multi Protocol iBGP (MP iBGP) related properties for this Ethernet fabric."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the Multi Protocol iBGP (MP iBGP) related properties for this Ethernet fabric."/>
         </Property>
         <Property Name="MultiProtocolEBGP" Type="AddressPool.v1_1_0.EBGP">
-          <Annotation Term="OData.Description" String="Multi Protocol EBGP (MP EBGP) related properties for this Ethernet fabric."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the Multi Protocol EBGP (MP EBGP) related properties for this Ethernet fabric."/>
+          <Annotation Term="OData.Description" String="Multi Protocol eBGP (MP eBGP) related properties for this Ethernet fabric."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the Multi Protocol eBGP (MP eBGP) related properties for this Ethernet fabric."/>
         </Property>
         <Property Name="BFDSingleHopOnly" Type="AddressPool.v1_1_0.BFDSingleHopOnly">
           <Annotation Term="OData.Description" String="Bidirectional Forwarding Detection (BFD) related properties for this Ethernet fabric."/>
@@ -234,12 +240,12 @@
           <Annotation Term="OData.LongDescription" String="This property shall contain the range of management IPv4 addresses assigned to Ethernet switches."/>
         </Property>
         <Property Name="IBGPAddressRange" Type="AddressPool.v1_1_0.IPv4AddressRange">
-          <Annotation Term="OData.Description" String="Internal BGP (IBGP) related addressing for this Ethernet fabric."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the range of IPv4 addresses assigned to Internal BGP (IBGP)."/>
+          <Annotation Term="OData.Description" String="Internal BGP (iBGP) related addressing for this Ethernet fabric."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the range of IPv4 addresses assigned to Internal BGP (iBGP)."/>
         </Property>
         <Property Name="EBGPAddressRange" Type="AddressPool.v1_1_0.IPv4AddressRange">
-          <Annotation Term="OData.Description" String="External BGP (EBGP) related addressing for this Ethernet fabric."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the range of IPv4 addresses assigned to External BGP (EBGP)."/>
+          <Annotation Term="OData.Description" String="External BGP (eBGP) related addressing for this Ethernet fabric."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the range of IPv4 addresses assigned to External BGP (eBGP)."/>
         </Property>
         <Property Name="DNSServer" Type="Collection(Edm.String)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -352,13 +358,13 @@
         </Property>
         <Property Name="ARPSupressionEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="Address Resolution Protocol (ARP) supression status."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether Address Resolution Protocol (ARP) surpression is enabled."/>
+          <Annotation Term="OData.Description" String="Address Resolution Protocol (ARP) suppression status."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether Address Resolution Protocol (ARP) suppression is enabled."/>
         </Property>
         <Property Name="NDPSupressionEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="Network Discovery Protocol (NDP) supression status."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether Network Discovery Protocol (NDP) surpression is enabled."/>
+          <Annotation Term="OData.Description" String="Network Discovery Protocol (NDP) suppression status."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether Network Discovery Protocol (NDP) suppression is enabled."/>
         </Property>
         <Property Name="NDPProxyEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -378,8 +384,8 @@
       </ComplexType>
 
       <ComplexType Name="EBGP" BaseType="AddressPool.v1_1_0.CommonBGPProperties">
-        <Annotation Term="OData.Description" String="External BGP (EBGP) related properties for an Ethernet fabric."/>
-        <Annotation Term="OData.LongDescription" String="This type shall contain the External BGP (EBGP) related properties for an Ethernet fabric."/>
+        <Annotation Term="OData.Description" String="External BGP (eBGP) related properties for an Ethernet fabric."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the External BGP (eBGP) related properties for an Ethernet fabric."/>
         <Property Name="AlwaysCompareMEDEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Compare Multi Exit Discriminator (MED) status."/>
@@ -403,7 +409,7 @@
         <Property Name="AllowDuplicateASEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Allow duplicate Autonomous System (AS) path."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether duplicate Autonomous System (AS) numbers are alllowed.  If `true`, routes with the same AS number as the recieving router should be allowed.  If `false`,routes should be dropped if the router recieves its own AS number in a Border Gateway Protocol (BGP) update."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether duplicate Autonomous System (AS) numbers are allowed.  If `true`, routes with the same AS number as the receiving router should be allowed.  If `false`,routes should be dropped if the router receives its own AS number in a Border Gateway Protocol (BGP) update."/>
         </Property>
         <Property Name="AllowOverrideASEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -412,13 +418,13 @@
         </Property>
         <Property Name="MultihopEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="External BGP (EBGP) multihop status."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether External BGP (EBGP) multihop is enabled."/>
+          <Annotation Term="OData.Description" String="External BGP (eBGP) multihop status."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether External BGP (eBGP) multihop is enabled."/>
         </Property>
         <Property Name="MultihopTTL" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="External BGP (EBGP) mutlihop Time to Live (TTL) value."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the External BGP (EBGP) mutlihop Time to Live (TTL) value."/>
+          <Annotation Term="OData.Description" String="External BGP (eBGP) multihop Time to Live (TTL) value."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the External BGP (eBGP) multihop Time to Live (TTL) value."/>
         </Property>
       </ComplexType>
 
@@ -444,7 +450,7 @@
         </Property>
         <Property Name="BGPRoute" Type="AddressPool.v1_1_0.BGPRoute">
           <Annotation Term="OData.Description" String="Border Gateway Protocol (BGP) route related properties."/>
-          <Annotation Term="OData.LongDescription" String="This property shall containBorder Gateway Protocol (BGP) route related properties."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain Border Gateway Protocol (BGP) route related properties."/>
         </Property>
         <Property Name="SendCommunityEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -470,7 +476,7 @@
         <Property Name="RequiredMinRxIntervalMilliseconds" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Bidirectional Forwarding Detection (BFD) receive value."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the Bidirectional Forwarding Detection (BFD) receive value.  The BFD recieve value determines how frequently (in milliseconds) BFD packets will be expected to be received from BFD peers."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the Bidirectional Forwarding Detection (BFD) receive value.  The BFD receive value determines how frequently (in milliseconds) BFD packets will be expected to be received from BFD peers."/>
         </Property>
         <Property Name="DemandModeEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -540,12 +546,12 @@
         <Annotation Term="OData.LongDescription" String="This type shall contain for assigning DHCP related properties to the Ethernet fabric."/>
         <Property Name="DHCPRelayEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="Dynamic Host Configuration Protocl (DHCP) relay status."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether Dynamic Host Configuration Protocl (DHCP) Relay is enabled."/>
+          <Annotation Term="OData.Description" String="Dynamic Host Configuration Protocol (DHCP) relay status."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether Dynamic Host Configuration Protocol (DHCP) Relay is enabled."/>
         </Property>
         <Property Name="DHCPInterfaceMTUBytes" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="Dynamic Host Configuration Protocl (DHCP) interface Maximum Transmission Unit (MTU)."/>
+          <Annotation Term="OData.Description" String="Dynamic Host Configuration Protocol (DHCP) interface Maximum Transmission Unit (MTU)."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the Maximum Transmission Unit (MTU) to use on this interface in bytes."/>
           <Annotation Term="Validation.Minimum" Int="68"/>
           <Annotation Term="Validation.Maximum" Int="9194"/>
@@ -654,7 +660,7 @@
         <Property Name="AllowOwnASEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Allow own Autonomous System (AS) status."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the Autonomous System (AS) of the recieving router is permitted in a Border Gateway Protocol (BGP) update.  If `true`, routes should be received and processed even if the router detects its own ASN in the AS-Path.  If `false`, they should be dropped."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the Autonomous System (AS) of the receiving router is permitted in a Border Gateway Protocol (BGP) update.  If `true`, routes should be received and processed even if the router detects its own ASN in the AS-Path.  If `false`, they should be dropped."/>
         </Property>
         <Property Name="ConnectRetrySeconds" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -722,7 +728,7 @@
         </Property>
         <Property Name="MaxPrefix" Type="AddressPool.v1_1_0.MaxPrefix">
           <Annotation Term="OData.Description" String="Border Gateway Protocol (BGP) max prefix properties."/>
-          <Annotation Term="OData.LongDescription" String="These properties are appliable to configuring Border Gateway Protocol (BGP) max prefix related properties."/>
+          <Annotation Term="OData.LongDescription" String="These properties are applicable to configuring Border Gateway Protocol (BGP) max prefix related properties."/>
         </Property>
       </ComplexType>
 
@@ -743,7 +749,7 @@
         <Property Name="ShutdownThresholdPercentage" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Shutdown threshold status."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the percentage of the maximum prefix recieved value at which the router starts to generate a warning message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the percentage of the maximum prefix received value at which the router starts to generate a warning message."/>
           <Annotation Term="Validation.Minimum" Int="1"/>
           <Annotation Term="Validation.Maximum" Int="100"/>
           <Annotation Term="Measures.Unit" String="%"/>
@@ -762,7 +768,7 @@
         <Property Name="GracefulRestartEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Border Gateway Protocol (BGP) graceful restart status."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whethere to enable Border Gateway Protocol (BGP) graceful restart features."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether to enable Border Gateway Protocol (BGP) graceful restart features."/>
         </Property>
         <Property Name="TimeSeconds" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -819,17 +825,17 @@
         <Property Name="SendDefaultRouteEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Send default route status."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the default route should be advertized.  If `true`, the default route is advertised to all Border Gateway Protocol (BGP) neighbors unless specifically denied.  If `false`, the default route is not advertised."/> 
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the default route should be advertised.  If `true`, the default route is advertised to all Border Gateway Protocol (BGP) neighbors unless specifically denied.  If `false`, the default route is not advertised."/> 
         </Property>
         <Property Name="DistanceExternal" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Route distance for external routes."/>
-          <Annotation Term="OData.LongDescription" String="This property shall modify the administrative distance for routes learned via External BGP (EBGP)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall modify the administrative distance for routes learned via External BGP (eBGP)."/>
         </Property>
         <Property Name="DistanceInternal" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Route distance for internal routes."/>
-          <Annotation Term="OData.LongDescription" String="This property shall modify the administrative distance for routes learned via Internal BGP (IBGP)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall modify the administrative distance for routes learned via Internal BGP (iBGP)."/>
         </Property>
         <Property Name="DistanceLocal" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -839,5 +845,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AddressPool.v1_1_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="AddressPool" BaseType="AddressPool.v1_1_0.AddressPool"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Aggregate_v1.xml b/static/redfish/v1/schema/Aggregate_v1.xml
index e111131..b2a6fbf 100644
--- a/static/redfish/v1/schema/Aggregate_v1.xml
+++ b/static/redfish/v1/schema/Aggregate_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Aggregate v1.0.0                                                    -->
+<!--# Redfish Schema:  Aggregate v1.0.1                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -150,5 +150,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Aggregate.v1_0_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Aggregate" BaseType="Aggregate.v1_0_0.Aggregate"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/AggregationService_v1.xml b/static/redfish/v1/schema/AggregationService_v1.xml
index 2954806..5547b6e 100644
--- a/static/redfish/v1/schema/AggregationService_v1.xml
+++ b/static/redfish/v1/schema/AggregationService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AggregationService v1.0.0                                           -->
+<!--# Redfish Schema:  AggregationService v1.0.1                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -164,5 +164,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationService.v1_0_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AggregationService" BaseType="AggregationService.v1_0_0.AggregationService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/AggregationSource_v1.xml b/static/redfish/v1/schema/AggregationSource_v1.xml
index 850b261..d2def09 100644
--- a/static/redfish/v1/schema/AggregationSource_v1.xml
+++ b/static/redfish/v1/schema/AggregationSource_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AggregationSource v1.0.0                                            -->
+<!--# Redfish Schema:  AggregationSource v1.1.0                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -23,6 +23,7 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ConnectionMethod_v1.xml">
     <edmx:Include Namespace="ConnectionMethod"/>
@@ -126,5 +127,106 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AggregationSource.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add SNMP settings to the AggregationSource."/>
+
+      <EntityType Name="AggregationSource" BaseType="AggregationSource.v1_0_0.AggregationSource">
+        <Property Name="SNMP" Type="AggregationSource.v1_1_0.SNMPSettings">
+          <Annotation Term="OData.Description" String="SNMP settings of the aggregation source."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMP settings of the aggregation source."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="SNMPSettings">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="Settings for an SNMP aggregation source."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the settings for an SNMP aggregation source."/>
+        <Property Name="AuthenticationKey" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
+          <Annotation Term="Validation.Pattern" String="(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\*+$)"/>
+        </Property>
+        <Property Name="AuthenticationProtocol" Type="AggregationSource.v1_1_0.SNMPAuthenticationProtocols">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The authentication protocol for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMPv3 authentication protocol."/>
+        </Property>
+        <Property Name="EncryptionKey" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
+          <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
+        </Property>
+        <Property Name="EncryptionProtocol" Type="AggregationSource.v1_1_0.SNMPEncryptionProtocols">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The encryption protocol for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMPv3 encryption protocol."/>
+        </Property>
+        <Property Name="AuthenticationKeySet" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates if the AuthenticationKey property is set."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain `true` if a valid value was provided for the AuthenticationKey property.  Otherwise, the property shall contain `false`."/>
+        </Property>
+        <Property Name="EncryptionKeySet" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates if the EncryptionKey property is set."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain `true` if a valid value was provided for the EncryptionKey property.  Otherwise, the property shall contain `false`."/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="SNMPAuthenticationProtocols">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication is not required."/>
+        </Member>
+        <Member Name="CommunityString">
+          <Annotation Term="OData.Description" String="Trap community string authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication using SNMP community strings and the value of TrapCommunity."/>
+        </Member>
+        <Member Name="HMAC_MD5">
+          <Annotation Term="OData.Description" String="HMAC-MD5-96 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol."/>
+        </Member>
+        <Member Name="HMAC_SHA96">
+          <Annotation Term="OData.Description" String="HMAC-SHA-96 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."/>
+        </Member>
+        <Member Name="HMAC128_SHA224">
+          <Annotation Term="OData.Description" String="HMAC-128-SHA-224 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC128SHA224AuthProtocol."/>
+        </Member>
+        <Member Name="HMAC192_SHA256">
+          <Annotation Term="OData.Description" String="HMAC-192-SHA-256 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC192SHA256AuthProtocol."/>
+        </Member>
+        <Member Name="HMAC256_SHA384">
+          <Annotation Term="OData.Description" String="HMAC-256-SHA-384 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC256SHA384AuthProtocol."/>
+        </Member>
+        <Member Name="HMAC384_SHA512">
+          <Annotation Term="OData.Description" String="HMAC-384-SHA-512 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC384SHA512AuthProtocol."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="SNMPEncryptionProtocols">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate there is no encryption."/>
+        </Member>
+        <Member Name="CBC_DES">
+          <Annotation Term="OData.Description" String="CBC-DES encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol."/>
+        </Member>
+        <Member Name="CFB128_AES128">
+          <Annotation Term="OData.Description" String="CFB128-AES-128 encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Assembly_v1.xml b/static/redfish/v1/schema/Assembly_v1.xml
index d9159f3..5e64ca0 100644
--- a/static/redfish/v1/schema/Assembly_v1.xml
+++ b/static/redfish/v1/schema/Assembly_v1.xml
@@ -82,12 +82,21 @@
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/SubProcessors/{ProcessorId2}/Assembly</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Assembly</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/SubProcessors/{ProcessorId2}/Assembly</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Assembly</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Assembly</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Assembly</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Assembly</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Assembly</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Assembly</String>
+            <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Assembly</String>
             <String>/redfish/v1/Chassis/{ChassisId}/Thermal/Fans/{FanId}/Assembly</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Fans/{FanId}/Assembly</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/PowerSubsystem/PowerSupplies/{PowerSupplyId}/Assembly</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -229,7 +238,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Assembly.v1_0_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines.  It was also created to update the description of the BinaryDataUri property."/>
+      <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines.  It was also created to update the description of the BinaryDataURI property."/>
       <EntityType Name="Assembly" BaseType="Assembly.v1_0_2.Assembly"/>
       <EntityType Name="AssemblyData" BaseType="Assembly.v1_0_2.AssemblyData"/>
     </Schema>
@@ -271,7 +280,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Assembly.v1_1_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines.  It was also created to update the description of the BinaryDataUri property."/>
+      <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines.  It was also created to update the description of the BinaryDataURI property."/>
       <EntityType Name="Assembly" BaseType="Assembly.v1_1_2.Assembly"/>
       <EntityType Name="AssemblyData" BaseType="Assembly.v1_1_2.AssemblyData"/>
     </Schema>
@@ -313,7 +322,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Assembly.v1_2_2">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines.  It was also created to update the description of the BinaryDataUri property."/>
+      <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines.  It was also created to update the description of the BinaryDataURI property."/>
       <EntityType Name="Assembly" BaseType="Assembly.v1_2_1.Assembly"/>
       <EntityType Name="AssemblyData" BaseType="Assembly.v1_2_1.AssemblyData"/>
     </Schema>
diff --git a/static/redfish/v1/schema/AttributeRegistry_v1.xml b/static/redfish/v1/schema/AttributeRegistry_v1.xml
index 0305fdd..904dcdd 100644
--- a/static/redfish/v1/schema/AttributeRegistry_v1.xml
+++ b/static/redfish/v1/schema/AttributeRegistry_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  AttributeRegistry v1.3.4                                            -->
+<!--# Redfish Schema:  AttributeRegistry v1.3.5                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -564,6 +564,12 @@
       <EntityType Name="AttributeRegistry" BaseType="AttributeRegistry.v1_0_8.AttributeRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AttributeRegistry.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AttributeRegistry" BaseType="AttributeRegistry.v1_0_9.AttributeRegistry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AttributeRegistry.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -648,6 +654,12 @@
       <EntityType Name="AttributeRegistry" BaseType="AttributeRegistry.v1_1_7.AttributeRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AttributeRegistry.v1_1_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AttributeRegistry" BaseType="AttributeRegistry.v1_1_8.AttributeRegistry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AttributeRegistry.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -716,6 +728,12 @@
       <EntityType Name="AttributeRegistry" BaseType="AttributeRegistry.v1_2_5.AttributeRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AttributeRegistry.v1_2_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AttributeRegistry" BaseType="AttributeRegistry.v1_2_6.AttributeRegistry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AttributeRegistry.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -766,5 +784,11 @@
       <EntityType Name="AttributeRegistry" BaseType="AttributeRegistry.v1_3_3.AttributeRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="AttributeRegistry.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="AttributeRegistry" BaseType="AttributeRegistry.v1_3_4.AttributeRegistry"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/CertificateCollection_v1.xml b/static/redfish/v1/schema/CertificateCollection_v1.xml
index 160a0a5..f703f0c 100644
--- a/static/redfish/v1/schema/CertificateCollection_v1.xml
+++ b/static/redfish/v1/schema/CertificateCollection_v1.xml
@@ -69,6 +69,43 @@
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/SecureBoot/SecureBootDatabases/{DatabaseId}/Certificates</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/SecureBoot/SecureBootDatabases/{DatabaseId}/Certificates</String>
             <String>/redfish/v1/EventService/Subscriptions/{EventDestinationId}/Certificates</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Certificates</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Memory/{MemoryId}/Certificates</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/Memory/{MemoryId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/Certificates</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Certificates</String>
+            <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates</String>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Certificates</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/Certificates</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/NetworkAdapters/{NetworkAdapterId}/Certificates</String>
           </Collection>
         </Annotation>
         <NavigationProperty Name="Members" Type="Collection(Certificate.Certificate)">
diff --git a/static/redfish/v1/schema/CertificateService_v1.xml b/static/redfish/v1/schema/CertificateService_v1.xml
index e66d344..d721ce4 100644
--- a/static/redfish/v1/schema/CertificateService_v1.xml
+++ b/static/redfish/v1/schema/CertificateService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CertificateService v1.0.3                                           -->
+<!--# Redfish Schema:  CertificateService v1.0.4                                           -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -65,7 +65,7 @@
 
       <Action Name="GenerateCSR" IsBound="true">
         <Annotation Term="OData.Description" String="This action makes a certificate signing request."/>
-        <Annotation Term="OData.LongDescription" String="This action shall make a certificate signing request.  The response shall contain a signing request that a certificate authority (CA) must sign.  The service should retain the private key that was generated during this request for installation of the certificate.  The private key should not be part of the response."/>
+        <Annotation Term="OData.LongDescription" String="This action shall make a certificate signing request.  The response shall contain a signing request that a certificate authority (CA) will sign.  The service should retain the private key that was generated during this request for installation of the certificate.  The private key should not be part of the response."/>
         <Parameter Name="CertificateService" Type="CertificateService.v1_0_0.Actions"/>
         <Parameter Name="CommonName" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Description" String="The fully qualified domain name of the component to secure."/>
@@ -235,5 +235,11 @@
       <EntityType Name="CertificateService" BaseType="CertificateService.v1_0_2.CertificateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CertificateService.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="CertificateService" BaseType="CertificateService.v1_0_3.CertificateService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Certificate_v1.xml b/static/redfish/v1/schema/Certificate_v1.xml
index 5fcc5de..03496f1 100644
--- a/static/redfish/v1/schema/Certificate_v1.xml
+++ b/static/redfish/v1/schema/Certificate_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Certificate v1.2.1                                                  -->
+<!--# Redfish Schema:  Certificate v1.2.2                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -66,6 +66,43 @@
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/SecureBoot/SecureBootDatabases/{DatabaseId}/Certificates/{CertificateId}</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/SecureBoot/SecureBootDatabases/{DatabaseId}/Certificates/{CertificateId}</String>
             <String>/redfish/v1/EventService/Subscriptions/{EventDestinationId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Memory/{MemoryId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/Memory/{MemoryId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/Certificates/{CertificateId}</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/NetworkAdapters/{NetworkAdapterId}/Certificates/{CertificateId}</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -133,7 +170,7 @@
 
       <Action Name="Rekey" IsBound="true">
         <Annotation Term="OData.Description" String="This action generates a new key-pair for a certificate and produces a certificate signing request."/>
-        <Annotation Term="OData.LongDescription" String="This action shall use the certificate data to generate a new key-pair for a certificate.  The response shall contain a signing request that a certificate authority (CA) must sign.  The service should retain the private key that generated this request for installation of the certificate.  The private key should not be part of the response.  The private key should not be part of the response."/>
+        <Annotation Term="OData.LongDescription" String="This action shall use the certificate data to generate a new key-pair for a certificate.  The response shall contain a signing request that a certificate authority (CA) will sign.  The service should retain the private key that generated this request for installation of the certificate.  The private key should not be part of the response.  The private key should not be part of the response."/>
         <Parameter Name="Certificate" Type="Certificate.v1_0_0.Actions"/>
         <Parameter Name="KeyPairAlgorithm" Type="Edm.String">
           <Annotation Term="OData.Description" String="The type of key-pair for use with signing algorithms."/>
@@ -164,7 +201,7 @@
 
       <Action Name="Renew" IsBound="true">
         <Annotation Term="OData.Description" String="This action generates a certificate signing request by using the existing information and key-pair of the certificate."/>
-        <Annotation Term="OData.LongDescription" String="This action shall generate a certificate signing request using the existing information and key-pair of the certificate.  The response shall contain a signing request that a certificate authority (CA) must sign.  The service should retain the private key that this request generates for when the certificate is installed.  The private key should not be part of the response."/>
+        <Annotation Term="OData.LongDescription" String="This action shall generate a certificate signing request using the existing information and key-pair of the certificate.  The response shall contain a signing request that a certificate authority (CA) will sign.  The service should retain the private key that this request generates for when the certificate is installed.  The private key should not be part of the response."/>
         <Parameter Name="Certificate" Type="Certificate.v1_0_0.Actions"/>
         <Parameter Name="ChallengePassword" Type="Edm.String">
           <Annotation Term="OData.Description" String="The challenge password to apply to the certificate for revocation requests."/>
@@ -305,6 +342,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_0_2.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_0_3.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -360,6 +403,12 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_1_1.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_1_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_1_2.Certificate"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -379,5 +428,11 @@
       <EntityType Name="Certificate" BaseType="Certificate.v1_2_0.Certificate"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_2_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Certificate" BaseType="Certificate.v1_2_1.Certificate"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Chassis_v1.xml b/static/redfish/v1/schema/Chassis_v1.xml
index 1a20ea8..1589bc7 100644
--- a/static/redfish/v1/schema/Chassis_v1.xml
+++ b/static/redfish/v1/schema/Chassis_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Chassis v1.14.0                                                     -->
+<!--# Redfish Schema:  Chassis v1.15.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -88,9 +88,24 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/MediaControllerCollection_v1.xml">
     <edmx:Include Namespace="MediaControllerCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerSubsystem_v1.xml">
+    <edmx:Include Namespace="PowerSubsystem"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/ThermalSubsystem_v1.xml">
+    <edmx:Include Namespace="ThermalSubsystem"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/DriveCollection_v1.xml">
     <edmx:Include Namespace="DriveCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics_v1.xml">
+    <edmx:Include Namespace="EnvironmentMetrics"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
+    <edmx:Include Namespace="CertificateCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -213,12 +228,30 @@
           <Annotation Term="OData.Description" String="The link to the thermal properties, such as fans, cooling, and sensors, for this chassis."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type Thermal that represents the thermal characteristics of this chassis."/>
           <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_15_0"/>
+                <PropertyValue Property="Description" String="This link has been deprecated in favor of the ThermalSubsystem link property."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </NavigationProperty>
         <NavigationProperty Name="Power" Type="Power.Power" ContainsTarget="true" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The link to the power properties, or power supplies, power policies, and sensors, for this chassis."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type Power that represents the power characteristics of this chassis."/>
           <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_15_0"/>
+                <PropertyValue Property="Description" String="This link has been deprecated in favor of the PowerSubsystem link property."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </NavigationProperty>
       </EntityType>
 
@@ -1381,5 +1414,42 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_15_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Certificates and Measurements to devices for attestation and identity management.  It was also created to add links to the PowerSubsystem, ThermalSubsystem, and EnvironmentMetrics resources."/>
+
+      <EntityType Name="Chassis" BaseType="Chassis.v1_14_0.Chassis">
+        <NavigationProperty Name="PowerSubsystem" Type="PowerSubsystem.PowerSubsystem" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the power subsystem properties for this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type PowerSubsystem that represents the power subsystem information for this chassis."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="ThermalSubsystem" Type="ThermalSubsystem.ThermalSubsystem" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the thermal subsystem properties for this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type ThermalSubsystem that represents the thermal subsystem information for this chassis."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="EnvironmentMetrics" Type="EnvironmentMetrics.EnvironmentMetrics" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the environment metrics for this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this chassis."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Circuit_v1.xml b/static/redfish/v1/schema/Circuit_v1.xml
index 9dde115..490593f 100644
--- a/static/redfish/v1/schema/Circuit_v1.xml
+++ b/static/redfish/v1/schema/Circuit_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Circuit v1.1.0                                                      -->
+<!--# Redfish Schema:  Circuit v1.2.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -200,6 +200,17 @@
         <Member Name="AC480V">
           <Annotation Term="OData.Description" String="AC 480V nominal."/>
         </Member>
+        <Member Name="DC48V">
+          <Annotation Term="OData.Description" String="DC 48V nominal."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_2_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
         <Member Name="DC240V">
           <Annotation Term="OData.Description" String="DC 240V nominal."/>
         </Member>
@@ -359,7 +370,7 @@
         <Property Name="CriticalCircuit" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Designates if this is a critical circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the circuit is desginated as a critical circuit, and therefore is excluded from autonomous logic that could affect the state of the circuit.  The value shall be `true` if the circuit is deemed critical, and `false` if the circuit is not critical."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the circuit is designated as a critical circuit, and therefore is excluded from autonomous logic that could affect the state of the circuit.  The value shall be `true` if the circuit is deemed critical, and `false` if the circuit is not critical."/>
         </Property>
         <Property Name="ElectricalContext" Type="Sensor.ElectricalContext">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -544,37 +555,37 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 1 to Line 2 voltage reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2ToLine3" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 2 to Line 3 voltage reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3ToLine1" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 3 to Line 1 voltage reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line1ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 1 to Neutral voltage reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 2 to Neutral voltage reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 3 to Neutral voltage reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement."/>
         </NavigationProperty>
       </ComplexType>
 
@@ -586,25 +597,25 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
           <Annotation Term="OData.Description" String="Line 1 current sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a CurrentSensor excerpt that measures current for L1.  This property shall not be present if the circuit does not include an L1 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Current that measures current for L1.  This property shall not be present if the circuit does not include an L1 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
           <Annotation Term="OData.Description" String="Line 2 current sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a CurrentSensor excerpt that measures current for L2.  This property shall not be present if the circuit does not include an L2 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Current that measures current for L2.  This property shall not be present if the circuit does not include an L2 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
           <Annotation Term="OData.Description" String="Line 3 current sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a CurrentSensor excerpt that measures current for L3.  This property shall not be present if the circuit does not include an L3 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Current that measures current for L3.  This property shall not be present if the circuit does not include an L3 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Neutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
           <Annotation Term="OData.Description" String="Neutral line current sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a CurrentSensor excerpt that measures current for the Neutral line.  This property shall not be present if the circuit does not include a Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Current that measures current for the Neutral line.  This property shall not be present if the circuit does not include a Neutral measurement."/>
         </NavigationProperty>
       </ComplexType>
 
@@ -616,37 +627,37 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="EnergykWh"/>
           <Annotation Term="OData.Description" String="The Line 1 to Line 2 energy reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a EnergykWhSensor excerpt that measures energy between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2ToLine3" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="EnergykWh"/>
           <Annotation Term="OData.Description" String="The Line 2 to Line 3 energy reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a EnergykWhSensor excerpt that measures energy between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3ToLine1" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="EnergykWh"/>
           <Annotation Term="OData.Description" String="The Line 3 to Line 1 energy reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a EnergykWhSensor excerpt that measures energy between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line1ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="EnergykWh"/>
           <Annotation Term="OData.Description" String="The Line 1 to Neutral energy reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a EnergykWhSensor excerpt that measures energy between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="EnergykWh"/>
           <Annotation Term="OData.Description" String="The Line 2 to Neutral energy reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a EnergykWhSensor excerpt that measures energy between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="EnergykWh"/>
           <Annotation Term="OData.Description" String="The Line 3 to Neutral energy reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a EnergykWhSensor excerpt that measures energy between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type EnergykWh that measures energy between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement."/>
         </NavigationProperty>
       </ComplexType>
 
@@ -658,37 +669,37 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
           <Annotation Term="OData.Description" String="The Line 1 to Line 2 power reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a PowerSensor excerpt that measures power between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Power that measures power between L1 and L2.  This property shall not be present if the circuit does not include an L1-L2 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2ToLine3" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
           <Annotation Term="OData.Description" String="The Line 2 to Line 3 power reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a PowerSensor excerpt that measures power between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a sensor excerpt of type Power that measures power between L2 and L3.  This property shall not be present if the circuit does not include an L2-L3 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3ToLine1" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
           <Annotation Term="OData.Description" String="The Line 3 to Line 1 power reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a PowerSensor excerpt that measures power between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Power that measures power between L3 and L1.  This property shall not be present if the circuit does not include an L3-L1 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line1ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
           <Annotation Term="OData.Description" String="The Line 1 to Neutral power reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a PowerSensor excerpt that measures power between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Power that measures power between L1 and Neutral.  This property shall not be present if the circuit does not include an L1-Neutral measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
           <Annotation Term="OData.Description" String="The Line 2 to Neutral power reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a PowerSensor excerpt that measures power between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Power that measures power between L2 and Neutral.  This property shall not be present if the circuit does not include an L2-Neutral measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
           <Annotation Term="OData.Description" String="The Line 3 to Neutral power reading for this circuit."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a PowerSensor excerpt that measures power between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Power that measures power between L3 and Neutral.  This property shall not be present if the circuit does not include an L3-Neutral measurement."/>
         </NavigationProperty>
       </ComplexType>
 
@@ -723,6 +734,12 @@
       <EntityType Name="Circuit" BaseType="Circuit.v1_0_0.Circuit"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_0_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_0_1.Circuit"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -737,5 +754,19 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_1_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Circuit" BaseType="Circuit.v1_1_0.Circuit"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Circuit.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add DC50V to NominalVoltageType."/>
+
+      <EntityType Name="Circuit" BaseType="Circuit.v1_1_1.Circuit"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/CollectionCapabilities_v1.xml b/static/redfish/v1/schema/CollectionCapabilities_v1.xml
index 24fc911..1565e90 100644
--- a/static/redfish/v1/schema/CollectionCapabilities_v1.xml
+++ b/static/redfish/v1/schema/CollectionCapabilities_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  CollectionCapabilities v1.2.1                                       -->
+<!--# Redfish Schema:  CollectionCapabilities v1.2.2                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -177,5 +177,11 @@
       <ComplexType Name="CollectionCapabilities" BaseType="CollectionCapabilities.v1_2_0.CollectionCapabilities"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="CollectionCapabilities.v1_2_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <ComplexType Name="CollectionCapabilities" BaseType="CollectionCapabilities.v1_2_1.CollectionCapabilities"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ComputerSystem_v1.xml b/static/redfish/v1/schema/ComputerSystem_v1.xml
index a7e53b3..68037a5 100644
--- a/static/redfish/v1/schema/ComputerSystem_v1.xml
+++ b/static/redfish/v1/schema/ComputerSystem_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ComputerSystem v1.13.0                                              -->
+<!--# Redfish Schema:  ComputerSystem v1.14.0                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -100,6 +100,9 @@
   <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/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -476,11 +479,11 @@
         </Member>
         <Member Name="PhysicallyPartitioned">
           <Annotation Term="OData.Description" String="A hardware-based partition of a computer system."/>
-          <Annotation Term="OData.LongDescription" String="A SystemType of PhysicallyPartition typically represents a single system constructed from one or more physical systems through a firmware or hardware-based service."/>
+          <Annotation Term="OData.LongDescription" String="A SystemType of PhysicallyPartitioned typically represents a single system constructed from one or more physical systems through a firmware or hardware-based service."/>
         </Member>
         <Member Name="VirtuallyPartitioned">
           <Annotation Term="OData.Description" String="A virtual or software-based partition of a computer system."/>
-          <Annotation Term="OData.LongDescription" String="A SystemType of VirtuallyPartition typically represents a single system constructed from one or more virtual systems through a software-based service."/>
+          <Annotation Term="OData.LongDescription" String="A SystemType of VirtuallyPartitioned typically represents a single system constructed from one or more virtual systems through a software-based service."/>
         </Member>
         <Member Name="Composed">
           <Annotation Term="OData.Description" String="A computer system constructed by binding resource blocks together."/>
@@ -546,7 +549,7 @@
         <Property Name="BootSourceOverrideTarget" Type="ComputerSystem.BootSource">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The current boot source to use at the next boot instead of the normal boot device, if BootSourceOverrideEnabled is `true`."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the source to boot the system from, overriding the normal boot order.  The Redfish.AllowableValues annotation specifies the valid values for this property.  `Pxe` indicates to PXE boot from the primary NIC; `Floppy`, `Cd`, `Usb`, and `Hdd` indicate to boot from their devices respectively.  `BiosSetup` indicates to boot into the native BIOS screen setup.  `Utilities` and `Diags` indicate to boot from the local utilities or diags partitions.  `UefiTarget` indicates to boot from the UEFI device path found in UefiTargetBootSourceOverride.  `UefiBootNext` indicates to boot from the UEFI BootOptionReference found in BootNext.  Changes to this property do not alter the BIOS persistent boot order configuration."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the source to boot the system from, overriding the normal boot order.  The Redfish.AllowableValues annotation specifies the valid values for this property.  `Pxe` indicates to PXE boot from the primary NIC; `Floppy`, `Cd`, `Usb`, and `Hdd` indicate to boot from their devices respectively.  `BiosSetup` indicates to boot into the native BIOS screen setup.  `Utilities` and `Diags` indicate to boot from the local utilities or diagnostics partitions.  `UefiTarget` indicates to boot from the UEFI device path found in UefiTargetBootSourceOverride.  `UefiBootNext` indicates to boot from the UEFI BootOptionReference found in BootNext.  Changes to this property do not alter the BIOS persistent boot order configuration."/>
         </Property>
         <Property Name="BootSourceOverrideEnabled" Type="ComputerSystem.v1_0_0.BootSourceOverrideEnabled">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -579,7 +582,7 @@
         <Property Name="Count" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The number of physical processors in the system."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the number of physical central processors in the system."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of physical central processors in the system."/>
           <Annotation Term="Validation.Minimum" Int="0"/>
         </Property>
         <Property Name="Model" Type="Edm.String">
@@ -697,10 +700,16 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_0_15">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_0_14.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_0_16">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_0_15.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.1"/>
@@ -783,7 +792,7 @@
         <Property Name="FirmwareVersion" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The firmware version of this Trusted Module."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the firwmare version as defined by the manufacturer for the Trusted Module."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the firmware version as defined by the manufacturer for the Trusted Module."/>
         </Property>
         <Property Name="InterfaceType" Type="ComputerSystem.v1_1_0.InterfaceType">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -887,10 +896,16 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_1_13">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_1_12.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_1_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_1_13.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -1076,13 +1091,20 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_2_12">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_2_11.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_2_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_2_12.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
+
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_2_1.ComputerSystem">
         <NavigationProperty Name="NetworkInterfaces" Type="NetworkInterfaceCollection.NetworkInterfaceCollection" ContainsTarget="true" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -1185,13 +1207,20 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_3_11">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_3_10.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_3_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_3_11.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
+
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_3_1.ComputerSystem"/>
 
       <ComplexType Name="MemorySummary" BaseType="ComputerSystem.v1_1_0.MemorySummary">
@@ -1270,13 +1299,20 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_4_10">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_4_9.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_4_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_4_10.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
+
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_4_2.ComputerSystem">
         <NavigationProperty Name="Redundancy" Type="Collection(Redundancy.Redundancy)" ContainsTarget="true">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -1291,7 +1327,7 @@
         <Property Name="SubModel" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The sub-model for this system."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the information about the sub-model (or config) of the system.  This shall not include the model/product name or the manufacturer name."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the information about the sub-model (or configuration) of the system.  This shall not include the model/product name or the manufacturer name."/>
         </Property>
       </EntityType>
 
@@ -1318,7 +1354,7 @@
         <Property Name="LogicalProcessorCount" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The number of logical processors in the system."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the number of logical central processors in the system."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of logical central processors in the system."/>
           <Annotation Term="Validation.Minimum" Int="0"/>
         </Property>
       </ComplexType>
@@ -1413,7 +1449,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_1">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to add units annotations on MemorySummary properties.  It was also created to force the regeneration of JSON Schema so that OData properties are marked as required, and integer properties are marked as integer rather than number.  Additionally, it was created to update the longDescription of several Boot Override properties."/>
+      <Annotation Term="OData.Description" String="This version was created to add units annotations on MemorySummary properties.  It was also created to force the regeneration of JSON Schema so that OData properties are marked as required, and integer properties are marked as integer rather than number.  Additionally, it was created to update the LongDescription of several Boot Override properties."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_0.ComputerSystem"/>
     </Schema>
 
@@ -1455,13 +1491,20 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_8">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_7.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_8.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
+
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_2.ComputerSystem">
         <Property Name="PowerRestorePolicy" Type="ComputerSystem.v1_6_0.PowerRestorePolicyTypes" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -1539,13 +1582,20 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_6_6">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_5.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_6_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_6.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
+
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_1.ComputerSystem"/>
 
       <ComplexType Name="Boot" BaseType="ComputerSystem.v1_6_0.Boot">
@@ -1592,13 +1642,20 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_7_5">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_4.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_7_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_5.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
+
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_0.ComputerSystem"/>
 
       <ComplexType Name="MemorySummary" BaseType="ComputerSystem.v1_4_0.MemorySummary">
@@ -1630,14 +1687,22 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_8_4">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_3.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_8_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_4.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
+
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_0.ComputerSystem"/>
+
       <ComplexType Name="Boot" BaseType="ComputerSystem.v1_7_0.Boot">
         <Property Name="HttpBootUri" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -1668,14 +1733,21 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_4">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_3.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_4.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
       <Annotation Term="OData.Description" String="This version was created to add new values to HostingRole."/>
+
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_1.ComputerSystem">
         <NavigationProperty Name="FabricAdapters" Type="FabricAdapterCollection.FabricAdapterCollection" ContainsTarget="true" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -1700,10 +1772,16 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_10_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_10_2.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_10_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_10_3.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -1755,10 +1833,16 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_11_2">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_1.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_11_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_2.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_12_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -1775,10 +1859,16 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_12_1">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorySummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
+      <Annotation Term="OData.Description" String="This version was created to remove to the restriction of `Continuous` with UefiTargetBootSourceOverride.  It was also created to clarify that ProcessorSummary only contains processors that execute system code.  It was also created to add annotation recommendations for ResetType."/>
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_12_0.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_12_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_12_1.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_13_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -2008,5 +2098,58 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_13_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions.  It was also created to add the word 'total' to the count properties in ProcessorSummary."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_0.ComputerSystem"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_14_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Certificates and Measurements and to add TrustedModuleRequiredToBoot to the Boot property.  It was also created to add CoreCount to the ProcessorSummary property."/>
+
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_1.ComputerSystem">
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Boot" BaseType="ComputerSystem.v1_11_0.Boot">
+        <Property Name="TrustedModuleRequiredToBoot" Type="ComputerSystem.v1_14_0.TrustedModuleRequiredToBoot">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The Trusted Module boot requirement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the Trusted Module boot requirement."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="ProcessorSummary" BaseType="ComputerSystem.v1_7_0.ProcessorSummary">
+        <Property Name="CoreCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of processor cores in the system."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of central processor cores in in the system."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="TrustedModuleRequiredToBoot">
+        <Member Name="Disabled">
+          <Annotation Term="OData.Description" String="No Trusted Module requirement to boot."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a Trusted Module is not required to boot."/>
+        </Member>
+        <Member Name="Required">
+          <Annotation Term="OData.Description" String="A functional Trusted Module is required to boot."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a functioning Trusted Module is required to boot."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Drive_v1.xml b/static/redfish/v1/schema/Drive_v1.xml
index af08929..9f4cf96 100644
--- a/static/redfish/v1/schema/Drive_v1.xml
+++ b/static/redfish/v1/schema/Drive_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################                   -->
-<!--# Redfish Schema:  Drive v1.11.0                                                                   -->
+<!--# Redfish Schema:  Drive v1.12.0                                                                   -->
 <!--#                                                                                                  -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,                  -->
 <!--# available at http://www.dmtf.org/standards/redfish                                               -->
@@ -51,6 +51,15 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StoragePool_v1.xml">
     <edmx:Include Namespace="StoragePool"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics_v1.xml">
+    <edmx:Include Namespace="EnvironmentMetrics"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
+    <edmx:Include Namespace="CertificateCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -457,6 +466,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_0_9.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_0_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_0_10.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -498,7 +513,6 @@
           <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type Task that represents the task associated with the operation."/>
         </NavigationProperty>
       </ComplexType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_1_1">
@@ -555,9 +569,16 @@
       <EntityType Name="Drive" BaseType="Drive.v1_1_8.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_1_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_1_9.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
+
       <EntityType Name="Drive" BaseType="Drive.v1_1_2.Drive"/>
 
       <ComplexType Name="Links" BaseType="Drive.v1_1_0.Links">
@@ -612,9 +633,16 @@
       <EntityType Name="Drive" BaseType="Drive.v1_2_6.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_2_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_2_7.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
+
       <EntityType Name="Drive" BaseType="Drive.v1_2_1.Drive">
         <NavigationProperty Name="Assembly" Type="Assembly.Assembly" ContainsTarget="true" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -661,9 +689,16 @@
       <EntityType Name="Drive" BaseType="Drive.v1_3_5.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_3_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_3_6.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
+
       <EntityType Name="Drive" BaseType="Drive.v1_3_0.Drive">
         <Property Name="PhysicalLocation" Type="Resource.Location" Nullable="false">
           <Annotation Term="OData.Description" String="The location of the drive."/>
@@ -708,9 +743,16 @@
       <EntityType Name="Drive" BaseType="Drive.v1_4_5.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_4_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_4_6.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
+
       <EntityType Name="Drive" BaseType="Drive.v1_4_1.Drive">
         <Property Name="HotspareReplacementMode" Type="Drive.v1_5_0.HotspareReplacementModeType">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -759,6 +801,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_5_4.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_5_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_5_5.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -792,10 +840,17 @@
       <EntityType Name="Drive" BaseType="Drive.v1_6_2.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_6_3.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
       <Annotation Term="OData.Description" String="This version was created to add a WriteCacheEnabled property and reset action for Drive."/>
+
       <EntityType Name="Drive" BaseType="Drive.v1_6_0.Drive">
         <Property Name="WriteCacheEnabled" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -817,6 +872,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_7_1.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_7_2.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -845,6 +906,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_8_1.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_8_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_8_2.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -871,6 +938,12 @@
       <EntityType Name="Drive" BaseType="Drive.v1_9_1.Drive"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_9_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_9_2.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -885,6 +958,12 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_10_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_10_0.Drive"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -899,5 +978,36 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_11_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Drive" BaseType="Drive.v1_11_0.Drive"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_12_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Certificates and Measurements to devices for attestation and identity management.  It was also created to add a link for EnvironmentMetrics."/>
+
+      <EntityType Name="Drive" BaseType="Drive.v1_11_1.Drive">
+        <NavigationProperty Name="EnvironmentMetrics" Type="EnvironmentMetrics.EnvironmentMetrics" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the environment metrics for this drive."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this drive."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/EndpointGroup_v1.xml b/static/redfish/v1/schema/EndpointGroup_v1.xml
index 321fb4b..82a0729 100644
--- a/static/redfish/v1/schema/EndpointGroup_v1.xml
+++ b/static/redfish/v1/schema/EndpointGroup_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  EndpointGroup v1.3.0                                                -->
+<!--# Redfish Schema:  EndpointGroup v1.3.1                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -242,6 +242,12 @@
       <EntityType Name="EndpointGroup" BaseType="EndpointGroup.v1_0_2.EndpointGroup"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EndpointGroup.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EndpointGroup" BaseType="EndpointGroup.v1_0_3.EndpointGroup"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EndpointGroup.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="WIP v1.0.5"/>
@@ -294,6 +300,12 @@
       <EntityType Name="EndpointGroup" BaseType="EndpointGroup.v1_1_3.EndpointGroup"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EndpointGroup.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EndpointGroup" BaseType="EndpointGroup.v1_1_4.EndpointGroup"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EndpointGroup.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="WIP v1.1.0"/>
@@ -314,6 +326,12 @@
       <EntityType Name="EndpointGroup" BaseType="EndpointGroup.v1_2_1.EndpointGroup"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EndpointGroup.v1_2_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EndpointGroup" BaseType="EndpointGroup.v1_2_2.EndpointGroup"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EndpointGroup.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -335,5 +353,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EndpointGroup.v1_3_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EndpointGroup" BaseType="EndpointGroup.v1_3_0.EndpointGroup"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Endpoint_v1.xml b/static/redfish/v1/schema/Endpoint_v1.xml
index c3081ad..e593a72 100644
--- a/static/redfish/v1/schema/Endpoint_v1.xml
+++ b/static/redfish/v1/schema/Endpoint_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Endpoint v1.5.0                                                     -->
+<!--# Redfish Schema:  Endpoint v1.5.1                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -408,7 +408,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_0_6">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format, clarifies the EntityRole enum descriptions, and adds a missing term to several properties to disallow them from being null."/>
+      <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format, clarifies the EntityRole enumeration descriptions, and adds a missing term to several properties to disallow them from being null."/>
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_0_5.Endpoint"/>
     </Schema>
 
@@ -430,6 +430,12 @@
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_0_8.Endpoint"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Endpoint" BaseType="Endpoint.v1_0_9.Endpoint"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -491,7 +497,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_1_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format, clarifies the EntityRole enum descriptions, and adds a missing term to several properties to disallow them from being null."/>
+      <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format, clarifies the EntityRole enumeration descriptions, and adds a missing term to several properties to disallow them from being null."/>
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_1_2.Endpoint"/>
     </Schema>
 
@@ -513,6 +519,12 @@
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_1_5.Endpoint"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_1_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Endpoint" BaseType="Endpoint.v1_1_6.Endpoint"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -541,7 +553,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_2_2">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format, clarifies the EntityRole enum descriptions, and adds a missing term to several properties to disallow them from being null."/>
+      <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format, clarifies the EntityRole enumeration descriptions, and adds a missing term to several properties to disallow them from being null."/>
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_2_1.Endpoint"/>
     </Schema>
 
@@ -563,17 +575,23 @@
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_2_4.Endpoint"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Endpoint" BaseType="Endpoint.v1_2_5.Endpoint"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
-      <Annotation Term="OData.Description" String="This version was created to add AccelerationFunction to the EntityType enum."/>
+      <Annotation Term="OData.Description" String="This version was created to add AccelerationFunction to the EntityType enumeration."/>
 
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_2_1.Endpoint"/>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_3_1">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format, clarifies the EntityRole enum descriptions, and adds a missing term to several properties to disallow them from being null."/>
+      <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format, clarifies the EntityRole enumeration descriptions, and adds a missing term to several properties to disallow them from being null."/>
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_3_0.Endpoint"/>
     </Schema>
 
@@ -595,6 +613,12 @@
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_3_3.Endpoint"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Endpoint" BaseType="Endpoint.v1_3_4.Endpoint"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -676,6 +700,12 @@
       <EntityType Name="Endpoint" BaseType="Endpoint.v1_4_1.Endpoint"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_4_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Endpoint" BaseType="Endpoint.v1_4_2.Endpoint"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -692,5 +722,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Endpoint.v1_5_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Endpoint" BaseType="Endpoint.v1_5_0.Endpoint"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/EnvironmentMetrics_v1.xml b/static/redfish/v1/schema/EnvironmentMetrics_v1.xml
new file mode 100644
index 0000000..4c970ba
--- /dev/null
+++ b/static/redfish/v1/schema/EnvironmentMetrics_v1.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  EnvironmentMetrics v1.0.0                                           -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Sensor_v1.xml">
+    <edmx:Include Namespace="Sensor"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EnvironmentMetrics">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="EnvironmentMetrics" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The EnvironmentMetrics schema represents the environmental metrics of a device."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent the environmental metrics for a Redfish implementation."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Memory/{MemoryId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Drives/{DriveId}</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/Memory/{MemoryId}</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/Drives/{DriveId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Chassis/{ChassisId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Facilities/{FacilityId}/EnvironmentMetrics</String>
+            <String>/redfish/v1/Facilities/{FacilityId}/AmbientMetrics</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+
+      <Action Name="ResetMetrics" IsBound="true">
+        <Parameter Name="EnvironmentMetrics" Type="EnvironmentMetrics.v1_0_0.Actions"/>
+        <Annotation Term="OData.Description" String="This action resets the summary metrics related to this equipment."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset any time intervals or counted values for this equipment."/>
+      </Action>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EnvironmentMetrics.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="EnvironmentMetrics" BaseType="EnvironmentMetrics.EnvironmentMetrics">
+        <NavigationProperty Name="TemperatureCelsius" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="Temperature (Celsius)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature sensor reading for this resource."/>
+        </NavigationProperty>
+        <NavigationProperty Name="HumidityPercent" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="Humidity (percent)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the humidity sensor reading for this resource."/>
+        </NavigationProperty>
+        <NavigationProperty Name="FanSpeedsPercent" Type="Collection(Sensor.Sensor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="FanArray"/>
+          <Annotation Term="OData.Description" String="Fan speeds (percent)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the fan speed readings for this resource."/>
+        </NavigationProperty>
+        <NavigationProperty Name="PowerWatts" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
+          <Annotation Term="OData.Description" String="Power consumption (Watts)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total power, measured in Watts, for this resource."/>
+        </NavigationProperty>
+        <NavigationProperty Name="EnergykWh" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="EnergykWh"/>
+          <Annotation Term="OData.Description" String="Energy consumption (kWh)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total energy, measured in kilowatt-hours (kW.h), for this resource."/>
+        </NavigationProperty>
+        <Property Name="Actions" Type="EnvironmentMetrics.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="EnvironmentMetrics.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/EthernetInterface_v1.xml b/static/redfish/v1/schema/EthernetInterface_v1.xml
index cf1d09e..95be6cb 100644
--- a/static/redfish/v1/schema/EthernetInterface_v1.xml
+++ b/static/redfish/v1/schema/EthernetInterface_v1.xml
@@ -282,6 +282,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_0_10.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_0_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_0_11.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -376,6 +382,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_1_8.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_1_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_1_9.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -440,6 +452,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_2_7.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_2_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_2_8.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -519,6 +537,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_3_6.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_3_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_3_7.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -686,6 +710,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_4_5.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_4_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_4_6.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -740,6 +770,12 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_5_3.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_5_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_5_4.EthernetInterface"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -785,5 +821,11 @@
       <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_6_1.EthernetInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EthernetInterface.v1_6_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EthernetInterface" BaseType="EthernetInterface.v1_6_2.EthernetInterface"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/EventDestination_v1.xml b/static/redfish/v1/schema/EventDestination_v1.xml
index e1fccec..67884e1 100644
--- a/static/redfish/v1/schema/EventDestination_v1.xml
+++ b/static/redfish/v1/schema/EventDestination_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  EventDestination v1.9.0                                             -->
+<!--# Redfish Schema:  EventDestination v1.10.0                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -83,13 +83,14 @@
           </Collection>
         </Annotation>
         <Member Name="Event">
-          <Annotation Term="OData.Description" String="The subscription destination receives JSON bodies of the Resource of type Event."/>
+          <Annotation Term="OData.Description" String="The subscription destination receives an event payload."/>
+          <Annotation Term="OData.LongDescription" String="The subscription destination shall receive an event payload as defined by the value of the Protocol property."/>
         </Member>
         <Member Name="MetricReport">
-          <Annotation Term="OData.Description" String="The subscription destination receives JSON bodies of the Resource of type MetricReport."/>
+          <Annotation Term="OData.Description" String="The subscription destination receives a metric report."/>
+          <Annotation Term="OData.LongDescription" String="The subscription destination shall receive a metric report payload as defined by the value of the Protocol property."/>
         </Member>
       </EnumType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_0_0">
@@ -139,6 +140,7 @@
       <EnumType Name="EventDestinationProtocol">
         <Member Name="Redfish">
           <Annotation Term="OData.Description" String="The destination follows the Redfish Specification for event notifications."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the destination follows the Redfish Specification for event notifications.  Destinations requesting EventFormatType of `Event` shall receive a Redfish resource of type Event.  Destinations requesting EventFormatType of `MetricReport` shall receive a Redfish resource of type MetricReport."/>
         </Member>
         <Member Name="SNMPv1">
           <Annotation Term="OData.Description" String="The destination follows the SNMPv1 protocol for event notifications."/>
@@ -308,6 +310,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_0_7.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_0_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_0_8.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -367,6 +375,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_1_6.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_1_7.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -424,6 +438,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_2_4.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_2_5.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -512,6 +532,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_3_2.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_3_3.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -552,6 +578,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_4_1.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_4_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_4_2.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -565,6 +597,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_5_0.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_5_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_5_1.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -573,8 +611,8 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_5_0.EventDestination">
         <Property Name="DeliveryRetryPolicy" Type="EventDestination.v1_6_0.DeliveryRetryPolicy">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="This property shall contain the subscription delivery retry policy for events, where the subscription type is RedfishEvent."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the subscription delivery retry policy for events where the subscription type is RedfishEvent.  If this property is not present, the policy shall be assumed to be TerminateAfterRetries."/>
+          <Annotation Term="OData.Description" String="The subscription delivery retry policy for events, where the subscription type is RedfishEvent."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the subscription delivery retry policy for events where the subscription type is RedfishEvent."/>
         </Property>
         <Property Name="Status" Type="Resource.Status" Nullable="false">
           <Annotation Term="OData.Description" String="This property shall contain the status of the subscription."/>
@@ -590,12 +628,27 @@
       <EnumType Name="DeliveryRetryPolicy">
         <Member Name="TerminateAfterRetries">
           <Annotation Term="OData.Description" String="The subscription is terminated after the maximum number of retries is reached."/>
+          <Annotation Term="OData.LongDescription" String="The subscription is terminated after the maximum number of retries is reached, specified by the DeliveryRetryAttempts property in the event service."/>
         </Member>
         <Member Name="SuspendRetries">
           <Annotation Term="OData.Description" String="The subscription is suspended after the maximum number of retries is reached."/>
+          <Annotation Term="OData.LongDescription" String="The subscription is suspended after the maximum number of retries is reached, specified by the DeliveryRetryAttempts property in the event service."/>
         </Member>
         <Member Name="RetryForever">
-          <Annotation Term="OData.Description" String="The subscription is not suspended or terminated, and attempts at delivery of future events shall continue even after the maximum number of retries is reached."/>
+          <Annotation Term="OData.Description" String="The subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries."/>
+          <Annotation Term="OData.LongDescription" String="The subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries.  The interval between retries remains constant and is specified by the DeliveryRetryIntervalSeconds property in the event service."/>
+        </Member>
+        <Member Name="RetryForeverWithBackoff">
+          <Annotation Term="OData.Description" String="The subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries, but issued over time according to a service-defined backoff algorithm."/>
+          <Annotation Term="OData.LongDescription" String="The subscription is not suspended or terminated, and attempts at delivery of future events shall continue regardless of the number of retries.  Retry attempts are issued over time according to a service-defined backoff algorithm.  The backoff algorithm might insert an increasing amount of delay between retry attempts and might reach a maximum."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_10_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Member>
       </EnumType>
     </Schema>
@@ -606,6 +659,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_6_0.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_6_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol.  It was also updated to allow for a service to select its own DeliveryRetryPolicy if not specified by the client."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_6_1.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -630,8 +689,8 @@
         <Property Name="AuthenticationKey" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the key used for SNMPv3 authentication.  The value shall be `null` in responses."/>
-          <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
+          <Annotation Term="Validation.Pattern" String="(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\*+$)"/>
         </Property>
         <Property Name="AuthenticationProtocol" Type="EventDestination.v1_7_0.SNMPAuthenticationProtocols">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -641,7 +700,7 @@
         <Property Name="EncryptionKey" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
           <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
         </Property>
         <Property Name="EncryptionProtocol" Type="EventDestination.v1_7_0.SNMPEncryptionProtocols">
@@ -668,6 +727,54 @@
           <Annotation Term="OData.Description" String="HMAC-SHA-96 authentication."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."/>
         </Member>
+        <Member Name="HMAC128_SHA224">
+          <Annotation Term="OData.Description" String="HMAC-128-SHA-224 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC128SHA224AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_10_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC192_SHA256">
+          <Annotation Term="OData.Description" String="HMAC-192-SHA-256 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC192SHA256AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_10_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC256_SHA384">
+          <Annotation Term="OData.Description" String="HMAC-256-SHA-384 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC256SHA384AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_10_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC384_SHA512">
+          <Annotation Term="OData.Description" String="HMAC-384-SHA-512 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC384SHA512AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_10_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="SNMPEncryptionProtocols">
@@ -692,6 +799,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_7_0.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_7_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol.  It was also created to correct descriptions and terms for SNMP properties.  It was also updated to allow for a service to select its own DeliveryRetryPolicy if not specified by the client."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_7_1.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -712,6 +825,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_8_0.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_8_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol.  It was also created to correct descriptions and terms for SNMP properties.  It was also updated to allow for a service to select its own DeliveryRetryPolicy if not specified by the client."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_8_1.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -870,5 +989,32 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_9_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to improve the descriptions for EventFormatType and EventDestinationProtocol.  It was also created to correct descriptions and terms for SNMP properties.  It was also updated to allow for a service to select its own DeliveryRetryPolicy if not specified by the client."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_0.EventDestination"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_10_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add additional SNMP authentication protocols and to provide better description for the authentication and encryption keys.  It also added `RetryForeverWithBackoff` to DeliveryRetryPolicy and long description details to the DeliveryRetryPolicy values."/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_1.EventDestination"/>
+
+      <ComplexType Name="SNMPSettings" BaseType="EventDestination.v1_7_0.SNMPSettings">
+        <Property Name="AuthenticationKeySet" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates if the AuthenticationKey property is set."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain `true` if a valid value was provided for the AuthenticationKey property.  Otherwise, the property shall contain `false`."/>
+        </Property>
+        <Property Name="EncryptionKeySet" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates if the EncryptionKey property is set."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain `true` if a valid value was provided for the EncryptionKey property.  Otherwise, the property shall contain `false`."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/EventService_v1.xml b/static/redfish/v1/schema/EventService_v1.xml
index 77bad25..1359a42 100644
--- a/static/redfish/v1/schema/EventService_v1.xml
+++ b/static/redfish/v1/schema/EventService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  EventService v1.7.0                                                 -->
+<!--# Redfish Schema:  EventService v1.7.1                                                 -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -264,6 +264,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_0_11.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_0_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_0_12.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -308,6 +314,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_1_4.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_1_5.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -326,8 +338,8 @@
         </Property>
         <Property Name="SubordinateResourcesSupported" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="An indication of whether the service supports the SubordinateResource property on both event subscriptions and generated events."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the service supports the SubordinateResource property on both event subscriptions and generated events."/>
+          <Annotation Term="OData.Description" String="An indication of whether the service supports the SubordinateResources property on both event subscriptions and generated events."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the service supports the SubordinateResources property on both event subscriptions and generated events."/>
         </Property>
         <Property Name="EventFormatTypes" Type="Collection(EventDestination.EventFormatType)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -389,15 +401,6 @@
           <Annotation Term="OData.LongDescription" String="This property shall indicate whether this service supports filtering by the OriginResource property."/>
         </Property>
       </ComplexType>
-
-      <EnumType Name="EventFormatType">
-        <Member Name="Event">
-          <Annotation Term="OData.Description" String="The subscription destination receives JSON bodies of type Event."/>
-        </Member>
-        <Member Name="MetricReport">
-          <Annotation Term="OData.Description" String="The subscription destination receives JSON bodies of type MetricReport."/>
-        </Member>
-      </EnumType>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_2_1">
@@ -424,6 +427,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_2_3.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_2_4.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -450,6 +459,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_3_2.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_3_3.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -477,6 +492,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_4_1.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_4_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_4_2.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -600,6 +621,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_5_1.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_5_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_5_2.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -619,6 +646,12 @@
       <EntityType Name="EventService" BaseType="EventService.v1_6_0.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_6_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_6_1.EventService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -627,5 +660,11 @@
       <EntityType Name="EventService" BaseType="EventService.v1_6_1.EventService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_7_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="EventService" BaseType="EventService.v1_7_0.EventService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Event_v1.xml b/static/redfish/v1/schema/Event_v1.xml
index 92007d7..65baa40 100644
--- a/static/redfish/v1/schema/Event_v1.xml
+++ b/static/redfish/v1/schema/Event_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Event v1.6.0                                                        -->
+<!--# Redfish Schema:  Event v1.6.1                                                        -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -136,7 +136,7 @@
         <Property Name="EventId" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The unique instance identifier of an event."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate a unique identifier for the event.  The value should be a string of a positive integer, and should be generated in a sequential manner."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a service-defined unique identifier for the event."/>
         </Property>
         <Property Name="EventTimestamp" Type="Edm.DateTimeOffset" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -146,7 +146,7 @@
         <Property Name="Severity" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The severity of the event."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the event, as defined by the Redfish Specification.  Services can replace the value defined in the message registry with a value more applicable to the implementation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the event, as defined in the 'Status' clause of the Redfish Specification.  Services can replace the value defined in the message registry with a value more applicable to the implementation."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -164,8 +164,8 @@
         </Property>
         <Property Name="MessageId" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The key used to find the message in a message registry."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a MessageId, as defined in the Redfish Specification."/>
+          <Annotation Term="OData.Description" String="The identifier for the message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a MessageId, as defined in the 'MessageId format' clause of the Redfish Specification."/>
           <Annotation Term="Validation.Pattern" String="^[A-Za-z0-9]+\.\d+\.\d+\.[A-Za-z0-9.]+$"/>
           <Annotation Term="Redfish.Required"/>
         </Property>
@@ -274,6 +274,13 @@
       <EntityType Name="EventRecord" BaseType="Event.v1_0_11.EventRecord"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_0_13">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas.  It was also updated to remove language in the long description for EventId to align with the specification."/>
+      <EntityType Name="Event" BaseType="Event.v1_0_12.Event"/>
+      <EntityType Name="EventRecord" BaseType="Event.v1_0_12.EventRecord"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.1"/>
@@ -359,6 +366,13 @@
       <EntityType Name="EventRecord" BaseType="Event.v1_1_9.EventRecord"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_1_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas.  It was also updated to remove language in the long description for EventId to align with the specification."/>
+      <EntityType Name="Event" BaseType="Event.v1_1_10.Event"/>
+      <EntityType Name="EventRecord" BaseType="Event.v1_1_10.EventRecord"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -459,6 +473,13 @@
       <EntityType Name="EventRecord" BaseType="Event.v1_2_6.EventRecord"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_2_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas.  It was also updated to remove language in the long description for EventId to align with the specification."/>
+      <EntityType Name="Event" BaseType="Event.v1_2_7.Event"/>
+      <EntityType Name="EventRecord" BaseType="Event.v1_2_7.EventRecord"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -510,6 +531,13 @@
       <EntityType Name="EventRecord" BaseType="Event.v1_3_4.EventRecord"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_3_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas.  It was also updated to remove language in the long description for EventId to align with the specification."/>
+      <EntityType Name="Event" BaseType="Event.v1_3_5.Event"/>
+      <EntityType Name="EventRecord" BaseType="Event.v1_3_5.EventRecord"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -541,6 +569,13 @@
       <EntityType Name="EventRecord" BaseType="Event.v1_4_2.EventRecord"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas.  It was also updated to remove language in the long description for EventId to align with the specification."/>
+      <EntityType Name="Event" BaseType="Event.v1_4_3.Event"/>
+      <EntityType Name="EventRecord" BaseType="Event.v1_4_3.EventRecord"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -549,7 +584,7 @@
       <EntityType Name="Event" BaseType="Event.v1_4_2.Event"/>
 
       <EntityType Name="EventRecord" BaseType="Event.v1_4_2.EventRecord">
-        <Property Name="MessageSeverity" Type="Resource.Health">
+        <Property Name="MessageSeverity" Type="Resource.Health" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The severity of the message in this event."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the message in this event.  Services can replace the value defined in the message registry with a value more applicable to the implementation."/>
@@ -564,6 +599,13 @@
       <EntityType Name="EventRecord" BaseType="Event.v1_5_0.EventRecord"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_5_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas.  It was also updated to remove language in the long description for EventId to align with the specification."/>
+      <EntityType Name="Event" BaseType="Event.v1_5_1.Event"/>
+      <EntityType Name="EventRecord" BaseType="Event.v1_5_1.EventRecord"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -579,5 +621,12 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Event.v1_6_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas.  It was also updated to remove language in the long description for EventId to align with the specification."/>
+      <EntityType Name="Event" BaseType="Event.v1_6_0.Event"/>
+      <EntityType Name="EventRecord" BaseType="Event.v1_6_0.EventRecord"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ExternalAccountProvider_v1.xml b/static/redfish/v1/schema/ExternalAccountProvider_v1.xml
index e24a443..6fc491c 100644
--- a/static/redfish/v1/schema/ExternalAccountProvider_v1.xml
+++ b/static/redfish/v1/schema/ExternalAccountProvider_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ExternalAccountProvider v1.1.3                                      -->
+<!--# Redfish Schema:  ExternalAccountProvider v1.2.0                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -18,6 +18,7 @@
     <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
@@ -109,11 +110,11 @@
       <EnumType Name="AccountProviderTypes">
         <Member Name="RedfishService">
           <Annotation Term="OData.Description" String="An external Redfish service."/>
-          <Annotation Term="OData.LongDescription" String="The external account provider shall be a DMTF Redfish Specification-comformant service.  The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service."/>
+          <Annotation Term="OData.LongDescription" String="The external account provider shall be a DMTF Redfish Specification-conformant service.  The ServiceAddresses format shall contain a set of URIs that correspond to a Redfish account service."/>
         </Member>
         <Member Name="ActiveDirectoryService">
           <Annotation Term="OData.Description" String="An external Active Directory service."/>
-          <Annotation Term="OData.LongDescription" String="The external account provider shall be a Microsoft Active Directory Technical Specification-comformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service."/>
+          <Annotation Term="OData.LongDescription" String="The external account provider shall be a Microsoft Active Directory Technical Specification-conformant service.  The ServiceAddresses format shall contain a set of fully qualified domain names (FQDN) or NetBIOS names that links to the set of domain servers for the Active Directory service."/>
         </Member>
         <Member Name="LDAPService">
           <Annotation Term="OData.Description" String="A generic external LDAP service."/>
@@ -281,6 +282,12 @@
       <EntityType Name="ExternalAccountProvider" BaseType="ExternalAccountProvider.v1_0_3.ExternalAccountProvider"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ExternalAccountProvider.v1_0_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="ExternalAccountProvider" BaseType="ExternalAccountProvider.v1_0_4.ExternalAccountProvider"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ExternalAccountProvider.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -312,5 +319,83 @@
       <EntityType Name="ExternalAccountProvider" BaseType="ExternalAccountProvider.v1_1_2.ExternalAccountProvider"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ExternalAccountProvider.v1_1_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="ExternalAccountProvider" BaseType="ExternalAccountProvider.v1_1_3.ExternalAccountProvider"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ExternalAccountProvider.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add TACACS+ support."/>
+
+      <EntityType Name="ExternalAccountProvider" BaseType="ExternalAccountProvider.v1_1_4.ExternalAccountProvider">
+        <Property Name="TACACSplusService" Type="ExternalAccountProvider.v1_2_0.TACACSplusService">
+          <Annotation Term="OData.Description" String="The additional information needed to parse a TACACS+ services."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain additional information needed to parse a TACACS+ services. This property should only be present inside a TACACSplus property."/>
+        </Property>
+        <Property Name="Priority" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The authentication priority for the external account provider."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the assigned priority for the specified external account provider.  The value `0` value shall indicate the highest priority.  Increasing values shall represent decreasing priority.  If an external provider does not have a priority assignment or two or more external providers have the same priority, the behavior shall be determined by the Redfish service.  The priority is used to determine the order of authentication and authorization for each external account provider."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Authentication" BaseType="ExternalAccountProvider.v1_0_0.Authentication">
+        <Property Name="EncryptionKey" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Specifies the encryption key."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value of a symmetric encryption key for account services that support some form of encryption, obfuscation, or authentication such as TACACS+.  The value shall be `null` in responses.  The property shall accept a hexadecimal string whose length depends on the external account service, such as TACACS+.  A TACACS+ service shall use this property to specify the secret key as defined in RFC8907."/>
+          <Annotation Term="Validation.Pattern" String="^[0-9a-fA-F]+$"/>
+        </Property>
+       <Property Name="EncryptionKeySet" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates if the EncryptionKey property is set."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain `true` if a valid value was provided for the EncryptionKey property.  Otherwise, the property shall contain `false`.  For a TACACS+ service, the value `false` shall indicate data obfuscation, as defined in section 4.5 of RFC8907, is disabled."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="TACACSplusService">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="Various settings to parse a TACACS+ service."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain settings for parsing a TACACS+ service."/>
+        <Property Name="PrivilegeLevelArgument" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the name of the TACACS+ argument name in an authorization request."/>
+          <Annotation Term="OData.LongDescription" String="This property shall specify the name of the argument in a TACACS+ Authorization REPLY packet body, as defined in RFC8907, that contains the user's privilege level."/>
+        </Property>
+        <Property Name="PasswordExchangeProtocols" Type="Collection(ExternalAccountProvider.v1_2_0.TACACSplusPasswordExchangeProtocol)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the allowed TACACS+ password exchange protocols."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate all the allowed TACACS+ password exchange protocol described under section 5.4.2 of RFC8907."/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="TACACSplusPasswordExchangeProtocol">
+        <Member Name="ASCII">
+          <Annotation Term="OData.Description" String="The ASCII Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the ASCII Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+        <Member Name="PAP">
+          <Annotation Term="OData.Description" String="The PAP Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the PAP Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+        <Member Name="CHAP">
+          <Annotation Term="OData.Description" String="The CHAP Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the CHAP Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+        <Member Name="MSCHAPv1">
+          <Annotation Term="OData.Description" String="The MS-CHAP v1 Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the MS-CHAP v1 Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+        <Member Name="MSCHAPv2">
+          <Annotation Term="OData.Description" String="The MS-CHAP v2 Login method."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the MS-CHAP v2 Login flow as described under section 5.4.2 of RFC8907."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Fabric_v1.xml b/static/redfish/v1/schema/Fabric_v1.xml
index 860456e..a782dd5 100644
--- a/static/redfish/v1/schema/Fabric_v1.xml
+++ b/static/redfish/v1/schema/Fabric_v1.xml
@@ -188,6 +188,12 @@
       <EntityType Name="Fabric" BaseType="Fabric.v1_0_6.Fabric"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Fabric.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Fabric" BaseType="Fabric.v1_0_7.Fabric"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Fabric.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -208,6 +214,12 @@
       <EntityType Name="Fabric" BaseType="Fabric.v1_1_0.Fabric"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Fabric.v1_1_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Fabric" BaseType="Fabric.v1_1_1.Fabric"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Fabric.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -228,5 +240,11 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Fabric.v1_2_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Fabric" BaseType="Fabric.v1_2_0.Fabric"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Facility_v1.xml b/static/redfish/v1/schema/Facility_v1.xml
index ebff60b..94fffa9 100644
--- a/static/redfish/v1/schema/Facility_v1.xml
+++ b/static/redfish/v1/schema/Facility_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Facility v1.0.1                                                     -->
+<!--# Redfish Schema:  Facility v1.1.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -36,6 +36,10 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerDistribution_v1.xml">
     <edmx:Include Namespace="PowerDistribution"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics_v1.xml">
+    <edmx:Include Namespace="EnvironmentMetrics"/>
+  </edmx:Reference>
+
   <edmx:DataServices>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Facility">
@@ -195,5 +199,25 @@
       <EntityType Name="Facility" BaseType="Facility.v1_0_0.Facility"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Facility.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="Facility" BaseType="Facility.v1_0_1.Facility">
+        <NavigationProperty Name="EnvironmentMetrics" Type="EnvironmentMetrics.EnvironmentMetrics" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the environment metrics for this facility."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this facility."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="AmbientMetrics" Type="EnvironmentMetrics.EnvironmentMetrics" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the ambient environment metrics for this facility."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type EnvironmentMetrics that specifies the outdoor environment metrics for this facility."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/FanCollection_v1.xml b/static/redfish/v1/schema/FanCollection_v1.xml
new file mode 100644
index 0000000..1c1091c
--- /dev/null
+++ b/static/redfish/v1/schema/FanCollection_v1.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  FanCollection                                                       -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Fan_v1.xml">
+    <edmx:Include Namespace="Fan"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="FanCollection">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="FanCollection" BaseType="Resource.v1_0_0.ResourceCollection">
+        <Annotation Term="OData.Description" String="The collection of Fan resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a resource collection of Fan instances for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Fans</String>
+          </Collection>
+        </Annotation>
+        <NavigationProperty Name="Members" Type="Collection(Fan.Fan)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The members of this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this collection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/Fan_v1.xml b/static/redfish/v1/schema/Fan_v1.xml
new file mode 100644
index 0000000..ab6f9d1
--- /dev/null
+++ b/static/redfish/v1/schema/Fan_v1.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  Fan v1.0.0                                                          -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml">
+    <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PhysicalContext_v1.xml">
+    <edmx:Include Namespace="PhysicalContext"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Redundancy_v1.xml">
+    <edmx:Include Namespace="Redundancy"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Sensor_v1.xml">
+    <edmx:Include Namespace="Sensor"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Assembly_v1.xml">
+    <edmx:Include Namespace="Assembly"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Fan">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="Fan" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The Fan schema describes a cooling fan unit for a computer system or similar devices contained within a chassis."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent the management properties for monitoring and management of cooling fans for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="true"/>
+            <Annotation Term="OData.Description" String="Any writable properties can be updated."/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/Fans/{FanId}</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Fan.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="Fan" BaseType="Fan.Fan">
+        <Property Name="PhysicalContext" Type="PhysicalContext.PhysicalContext" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The area or device associated with this fan."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a description of the affected device or region within the chassis with which this fan is associated."/>
+        </Property>
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <NavigationProperty Name="SpeedPercent" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Fan"/>
+          <Annotation Term="OData.Description" String="The fan speed reading."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the fan speed sensor."/>
+        </NavigationProperty>
+        <Property Name="Manufacturer" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The manufacturer of this fan."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the name of the organization responsible for producing the fan.  This organization might be the entity from whom the fan is purchased, but this is not necessarily true."/>
+        </Property>
+        <Property Name="Model" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The model number for this fan."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the model information as defined by the manufacturer for this fan."/>
+        </Property>
+        <Property Name="SerialNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The serial number for this fan."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the serial number as defined by the manufacturer for this fan."/>
+        </Property>
+        <Property Name="PartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The part number for this fan."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the part number as defined by the manufacturer for this fan."/>
+        </Property>
+        <Property Name="SparePartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The spare part number for this fan."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the spare or replacement part number as defined by the manufacturer for this fan."/>
+        </Property>
+        <Property Name="Location" Type="Resource.Location" Nullable="false">
+          <Annotation Term="OData.Description" String="The location of the fan."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain location information of this fan."/>
+        </Property>
+        <Property Name="LocationIndicatorActive" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indicator allowing an operator to physically locate this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the state of the indicator used to physically identify or locate this resource."/>
+        </Property>
+        <Property Name="HotPluggable" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An indication of whether this device can be inserted or removed while the equipment is in operation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the device can be inserted or removed while the underlying equipment otherwise remains in its current operational state.  Hot-pluggable devices can become operable without altering the operational state of the underlying equipment.  Devices that cannot be inserted or removed from equipment in operation, or devices that cannot become operable without affecting the operational state of that equipment, shall be not hot-pluggable."/>
+        </Property>
+        <NavigationProperty Name="Assembly" Type="Assembly.Assembly" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the assembly associated with this fan."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type Assembly."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Actions" Type="Fan.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="Fan.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/HostInterfaceCollection_v1.xml b/static/redfish/v1/schema/HostInterfaceCollection_v1.xml
index 62ffae7..4b623c0 100644
--- a/static/redfish/v1/schema/HostInterfaceCollection_v1.xml
+++ b/static/redfish/v1/schema/HostInterfaceCollection_v1.xml
@@ -33,7 +33,7 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
 
       <EntityType Name="HostInterfaceCollection" BaseType="Resource.v1_0_0.ResourceCollection">
-        <Annotation Term="OData.Description" String="The collection of hostInterface Resource instances."/>
+        <Annotation Term="OData.Description" String="The collection of HostInterface Resource instances."/>
         <Annotation Term="OData.LongDescription" String="This Resource shall represent a Resource Collection of HostInterface instances for a Redfish implementation."/>
         <Annotation Term="Capabilities.InsertRestrictions">
           <Record>
diff --git a/static/redfish/v1/schema/JobService_v1.xml b/static/redfish/v1/schema/JobService_v1.xml
index a49522f..3ebbec8 100644
--- a/static/redfish/v1/schema/JobService_v1.xml
+++ b/static/redfish/v1/schema/JobService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  JobService v1.0.3                                                   -->
+<!--# Redfish Schema:  JobService v1.0.4                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -160,5 +160,11 @@
       <EntityType Name="JobService" BaseType="JobService.v1_0_2.JobService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="JobService.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="JobService" BaseType="JobService.v1_0_3.JobService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Job_v1.xml b/static/redfish/v1/schema/Job_v1.xml
index 8f34905..3debd20 100644
--- a/static/redfish/v1/schema/Job_v1.xml
+++ b/static/redfish/v1/schema/Job_v1.xml
@@ -194,7 +194,7 @@
         </Member>
         <Member Name="UserIntervention">
           <Annotation Term="OData.Description" String="Job is waiting for user intervention."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation is waiting for a user to intervene and must be manually continued, stopped, or cancelled."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent that the operation is waiting for a user to intervene and needs to be manually continued, stopped, or cancelled."/>
         </Member>
         <Member Name="Continue">
           <Annotation Term="OData.Description" String="Job is to resume operation."/>
@@ -276,5 +276,11 @@
       <EntityType Name="Job" BaseType="Job.v1_0_4.Job"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Job.v1_0_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Job" BaseType="Job.v1_0_5.Job"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/LogEntry_v1.xml b/static/redfish/v1/schema/LogEntry_v1.xml
index 60091fc..c23f93b 100644
--- a/static/redfish/v1/schema/LogEntry_v1.xml
+++ b/static/redfish/v1/schema/LogEntry_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  LogEntry v1.7.0                                                     -->
+<!--# Redfish Schema:  LogEntry v1.8.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -47,7 +47,7 @@
         </Annotation>
         <Annotation Term="Capabilities.UpdateRestrictions">
           <Record>
-            <PropertyValue Property="Updatable" Bool="false"/>
+            <PropertyValue Property="Updatable" Bool="true"/>
           </Record>
         </Annotation>
         <Annotation Term="Capabilities.DeleteRestrictions">
@@ -687,6 +687,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_0_12.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_0_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_0_13.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -733,7 +739,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_1_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to change EventType to use the unversioned definition.  It was also created to add descriptions to various enum values."/>
+      <Annotation Term="OData.Description" String="This version was created to change EventType to use the unversioned definition.  It was also created to add descriptions to various enumeration values."/>
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_1_2.LogEntry"/>
     </Schema>
 
@@ -785,6 +791,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_1_10.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_1_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_1_11.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -815,7 +827,7 @@
     
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_2_1">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to change EventType to use the unversioned definition.  It was also created to add descriptions to various enum values."/>
+      <Annotation Term="OData.Description" String="This version was created to change EventType to use the unversioned definition.  It was also created to add descriptions to various enumeration values."/>
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_2_0.LogEntry"/>
     </Schema>
 
@@ -867,6 +879,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_2_8.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_2_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_2_9.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -934,6 +952,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_3_7.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_3_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_3_8.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -990,6 +1014,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_4_6.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_4_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_4_7.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -1023,6 +1053,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_5_2.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_5_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_5_3.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -1049,10 +1085,16 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_6_1.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_6_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_6_2.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
-      <Annotation Term="OData.Description" String="This version was created to add AdditionalDataSizeBytes, AdditionalDataUri, and DiagnosticDataType properties."/>
+      <Annotation Term="OData.Description" String="This version was created to add AdditionalDataSizeBytes, AdditionalDataURI, and DiagnosticDataType properties."/>
 
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_6_2.LogEntry">
         <Property Name="AdditionalDataSizeBytes" Type="Edm.Int64">
@@ -1095,5 +1137,25 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_7_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_7_0.LogEntry"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_8_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add the Resolved property."/>
+
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_7_1.LogEntry">
+        <Property Name="Resolved" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if the cause of the log entry has been resolved or repaired."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an indication if the cause of the log entry has been resolved or repaired.  The value `true` shall indicate if the cause of the log entry has been resolved or repaired.  This property shall contain the value `false` if the log entry is still active.  The value `false` shall be the initial state."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/LogService_v1.xml b/static/redfish/v1/schema/LogService_v1.xml
index 8a6fe6a..2665623 100644
--- a/static/redfish/v1/schema/LogService_v1.xml
+++ b/static/redfish/v1/schema/LogService_v1.xml
@@ -217,7 +217,7 @@
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogService.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
-      <Annotation Term="OData.Description" String="This version was created to add LogPurpose and EntryType properties."/>
+      <Annotation Term="OData.Description" String="This version was created to add LogEntryType property."/>
 
       <EntityType Name="LogService" BaseType="LogService.v1_0_5.LogService">
         <Property Name="LogEntryType" Type="LogService.v1_1_0.LogEntryTypes">
diff --git a/static/redfish/v1/schema/ManagerAccount_v1.xml b/static/redfish/v1/schema/ManagerAccount_v1.xml
index 7fed078..e3ea038 100644
--- a/static/redfish/v1/schema/ManagerAccount_v1.xml
+++ b/static/redfish/v1/schema/ManagerAccount_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ManagerAccount v1.6.2                                               -->
+<!--# Redfish Schema:  ManagerAccount v1.7.0                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -64,6 +64,101 @@
           </Collection>
         </Annotation>
       </EntityType>
+
+      <EnumType Name="AccountTypes">
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_4_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+        <Member Name="Redfish">
+          <Annotation Term="OData.Description" String="Allow access to the Redfish service."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to access Redfish services.  If the version of the ManagerAccount resource is lower than the schema version when another enumeration value in this list was added, the implementation might include that functionality as part of the `Redfish` value."/>
+        </Member>
+        <Member Name="SNMP">
+          <Annotation Term="OData.Description" String="Allow access to SNMP services."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to access SNMP services."/>
+        </Member>
+        <Member Name="OEM">
+          <Annotation Term="OData.Description" String="OEM account type.  See the OEMAccountTypes property."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to access the services listed in the OemAccountTypes property."/>
+        </Member> 
+        <Member Name="HostConsole">
+          <Annotation Term="OData.Description" String="Allow access to the host's console, which could be connected through Telnet, SSH, or other protocol."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to access the host console."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="ManagerConsole">
+          <Annotation Term="OData.Description" String="Allow access to the manager's console, which could be connected through Telnet, SSH, SM CLP, or other protocol."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to access the manager console."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="IPMI">
+          <Annotation Term="OData.Description" String="Allow access to the Intelligent Platform Management Interface service."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to access the Intelligent Platform Management Interface service."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="KVMIP">
+          <Annotation Term="OData.Description" String="Allow access to a Keyboard-Video-Mouse over IP session."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to access the Keyboard-Video-Mouse over IP session service."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="VirtualMedia">
+          <Annotation Term="OData.Description" String="Allow access to control virtual media."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to control virtual media."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="WebUI">
+          <Annotation Term="OData.Description" String="Allow access to a web user interface session, such as a graphical interface or another web-based protocol."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the account is allowed to access the web interface."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+      </EnumType>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_0_0">
@@ -325,10 +420,10 @@
           <Annotation Term="OData.Description" String="The SNMP settings for this account."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the SNMP settings for this account when AccountTypes contains `SNMP`."/>
         </Property>
-        <Property Name="AccountTypes" Type="Collection(ManagerAccount.v1_4_0.AccountTypes)">
+        <Property Name="AccountTypes" Type="Collection(ManagerAccount.AccountTypes)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The account types."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the various account types that apply to the account.  If this property is not provided by the client, the default value shall be an array with the single value `Redfish`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the various account types that apply to the account.  If this property is not provided by the client, the default value shall be an array that contains the value `Redfish`.  The service might add additional values when this property is set or updated if allowed by the value of the StrictAccountTypes property."/>
           <Annotation Term="Redfish.Required"/>
         </Property>
         <Property Name="OEMAccountTypes" Type="Collection(Edm.String)">
@@ -346,7 +441,7 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.  This property accepts a passphrase or a hex-encoded key.  If the string starts with `Passphrase:`, the remainder of the string shall be the passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  If the string starts with `Hex:`, then the remainder of the string shall be the key encoded in hexadecimal notation.  If the string starts with neither, the full string shall be a passphrase and shall be converted to the key as described in the 'Password to Key Algorithm' section of RFC3414.  The passphrase can contain any printable characters except for the double quotation mark."/>
-          <Annotation Term="Validation.Pattern" String="(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24})|(^\*+$)"/>
+          <Annotation Term="Validation.Pattern" String="(^[ !#-~]+$)|(^Passphrase:[ ^[ !#-~]+$)|(^Hex:[0-9A-Fa-f]{24,96})|(^\*+$)"/>
         </Property>
         <Property Name="AuthenticationProtocol" Type="ManagerAccount.v1_4_0.SNMPAuthenticationProtocols">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -366,18 +461,6 @@
         </Property>
       </ComplexType>
 
-      <EnumType Name="AccountTypes">
-        <Member Name="Redfish">
-          <Annotation Term="OData.Description" String="Allow access to the Redfish service."/>
-        </Member>
-        <Member Name="SNMP">
-          <Annotation Term="OData.Description" String="Allow access to SNMP services."/>
-        </Member>
-        <Member Name="OEM">
-          <Annotation Term="OData.Description" String="OEM account type."/>
-        </Member> 
-      </EnumType>
-
       <EnumType Name="SNMPAuthenticationProtocols">
         <Member Name="None">
           <Annotation Term="OData.Description" String="No authentication."/>
@@ -391,6 +474,54 @@
           <Annotation Term="OData.Description" String="HMAC-SHA-96 authentication."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."/>
         </Member>
+        <Member Name="HMAC128_SHA224">
+          <Annotation Term="OData.Description" String="HMAC-128-SHA-224 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC128SHA224AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC192_SHA256">
+          <Annotation Term="OData.Description" String="HMAC-192-SHA-256 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC192SHA256AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC256_SHA384">
+          <Annotation Term="OData.Description" String="HMAC-256-SHA-384 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC256SHA384AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC384_SHA512">
+          <Annotation Term="OData.Description" String="HMAC-384-SHA-512 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC384SHA512AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="SNMPEncryptionProtocols">
@@ -497,5 +628,19 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_6_1.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_7_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add additional SNMPv3 authentication protocols.  It was also created to extend the values for AccountTypes."/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_6_2.ManagerAccount">
+        <Property Name="StrictAccountTypes" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if the service needs to use the account types exactly as specified when the account is created or updated."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if the service needs to use the value of AccountTypes and OEMAccountTypes values exactly as specified.  A `true` value shall indicate the service needs to either accept the value without changes or reject the request.  A `false` value shall indicate the service might add additional `AccountTypes` and `OEMAccountTypes` values as needed to support limitations it has in separately controlling access to individual services.  If this property is not present, the value shall be assumed to be `false`.  An update of the service might cause account types to be added to or removed from the AccountTypes and OEMAccountTypes properties, regardless of the value of this property.  After a service update, clients should inspect all accounts where the value of this property is `true` and perform maintenance as needed."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml b/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml
index 62814b1..a66c396 100644
--- a/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml
+++ b/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ManagerNetworkProtocol v1.6.1                                       -->
+<!--# Redfish Schema:  ManagerNetworkProtocol v1.7.0                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -94,7 +94,7 @@
         </Property>
         <Property Name="VirtualMedia" Type="ManagerNetworkProtocol.v1_0_0.Protocol" Nullable="false">
           <Annotation Term="OData.Description" String="The settings for this manager's virtual media support that apply to all system instances controlled by this manager."/>
-          <Annotation Term="OData.LongDescription" String="This object shall contain the virtual media protocol settings for this manager.  The Port property shall contain the TCP port assigned for Virtual Media usage.  If multiple systems are supported by this manager, these properites, if present, apply to all instances of virtual media controlled by this manager."/>
+          <Annotation Term="OData.LongDescription" String="This object shall contain the virtual media protocol settings for this manager.  The Port property shall contain the TCP port assigned for Virtual Media usage.  If multiple systems are supported by this manager, these properties, if present, apply to all instances of virtual media controlled by this manager."/>
         </Property>
         <Property Name="Telnet" Type="ManagerNetworkProtocol.v1_0_0.Protocol" Nullable="false">
           <Annotation Term="OData.Description" String="The settings for this manager's Telnet protocol support."/>
@@ -219,6 +219,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions for the VirtualMedia and KVMIP properties."/>
       <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_0_7.ManagerNetworkProtocol"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_0_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_0_8.ManagerNetworkProtocol"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -260,6 +266,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions for the VirtualMedia and KVMIP properties."/>
       <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_1_4.ManagerNetworkProtocol"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_1_5.ManagerNetworkProtocol"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -324,6 +336,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions for the VirtualMedia and KVMIP properties."/>
       <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_2_3.ManagerNetworkProtocol"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_2_4.ManagerNetworkProtocol"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -361,6 +379,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions for the VirtualMedia and KVMIP properties."/>
       <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_3_2.ManagerNetworkProtocol"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_3_3.ManagerNetworkProtocol"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -394,6 +418,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions for the VirtualMedia and KVMIP properties."/>
       <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_4_2.ManagerNetworkProtocol"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_4_3.ManagerNetworkProtocol"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -515,6 +545,54 @@
           <Annotation Term="OData.Description" String="HMAC-SHA-96 authentication."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."/>
         </Member>
+        <Member Name="HMAC128_SHA224">
+          <Annotation Term="OData.Description" String="HMAC-128-SHA-224 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC128SHA224AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC192_SHA256">
+          <Annotation Term="OData.Description" String="HMAC-192-SHA-256 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC192SHA256AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC256_SHA384">
+          <Annotation Term="OData.Description" String="HMAC-256-SHA-384 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC256SHA384AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="HMAC384_SHA512">
+          <Annotation Term="OData.Description" String="HMAC-384-SHA-512 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC7860-defined usmHMAC384SHA512AuthProtocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="SNMPEncryptionProtocols">
@@ -548,6 +626,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions for SNMP-related properties to clarify that they apply to the manager's SNMP support.  It was also created to update the descriptions for the VirtualMedia and KVMIP properties."/>
       <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_5_1.ManagerNetworkProtocol"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_5_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_5_2.ManagerNetworkProtocol"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -570,6 +654,20 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions for SNMP-related properties to clarify that they apply to the manager's SNMP support.  It was also created to update the descriptions for the VirtualMedia and KVMIP properties."/>
       <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_6_0.ManagerNetworkProtocol"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_6_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_6_1.ManagerNetworkProtocol"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_7_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add additional SNMP authentication protocols."/>
+
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_6_2.ManagerNetworkProtocol"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Manager_v1.xml b/static/redfish/v1/schema/Manager_v1.xml
index fd4899c..cacb915 100644
--- a/static/redfish/v1/schema/Manager_v1.xml
+++ b/static/redfish/v1/schema/Manager_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Manager v1.10.0                                                     -->
+<!--# Redfish Schema:  Manager v1.11.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -222,13 +222,13 @@
         <Property Name="DateTimeLocalOffset" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The time offset from UTC that the DateTime property is in `+HH:MM` format."/>
-          <Annotation Term="OData.LongDescription" String="This property shall represent the offset from UTC time that the current DataTime property contains."/>
+          <Annotation Term="OData.LongDescription" String="This property shall represent the offset from UTC time that the current DateTime property contains."/>
           <Annotation Term="Validation.Pattern" String="^([-+][0-1][0-9]:[0-5][0-9])$"/>
         </Property>
         <Property Name="FirmwareVersion" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The firmware version of this manager."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the firwmare version as defined by the manufacturer for the associated manager."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the firmware version as defined by the manufacturer for the associated manager."/>
         </Property>
         <Property Name="SerialConsole" Type="Manager.v1_0_0.SerialConsole" Nullable="false">
           <Annotation Term="OData.Description" String="The serial console service that this manager provides."/>
@@ -494,6 +494,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_0_12.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_0_14">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_0_13.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -576,6 +582,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_1_10.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_1_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_1_11.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -655,6 +667,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_2_10.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_2_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_2_11.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -729,6 +747,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_3_9.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_3_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_3_10.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -793,6 +817,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_4_6.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_4_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_4_7.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -849,6 +879,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_5_5.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_5_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_5_6.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -889,6 +925,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_6_2.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_6_3.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -930,6 +972,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_7_2.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_7_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_7_3.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -962,6 +1010,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_8_1.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_8_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_8_2.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -997,6 +1051,12 @@
       <Annotation Term="OData.Description" String="This version was created to add annotation recommendations for ResetType."/>
       <EntityType Name="Manager" BaseType="Manager.v1_9_0.Manager"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_9_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_9_1.Manager"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1012,5 +1072,34 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_10_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Manager" BaseType="Manager.v1_10_0.Manager"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Manager.v1_11_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Location, LocationIndicatorActive, and SparePartNumber."/>
+
+      <EntityType Name="Manager" BaseType="Manager.v1_10_1.Manager">
+        <Property Name="Location" Type="Resource.Location" Nullable="false">
+          <Annotation Term="OData.Description" String="The location of the manager."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain location information of the associated manager."/>
+        </Property>
+        <Property Name="LocationIndicatorActive" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indicator allowing an operator to physically locate this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the state of the indicator used to physically identify or locate this resource.  A write to this property shall update the value of IndicatorLED in this resource, if supported, to reflect the implementation of the locating function."/>
+        </Property>
+        <Property Name="SparePartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The spare part number of the manager."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the spare part number of the manager."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/MemoryChunks_v1.xml b/static/redfish/v1/schema/MemoryChunks_v1.xml
index a6c2ca7..cc96329 100644
--- a/static/redfish/v1/schema/MemoryChunks_v1.xml
+++ b/static/redfish/v1/schema/MemoryChunks_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MemoryChunks v1.4.0                                                 -->
+<!--# Redfish Schema:  MemoryChunks v1.4.1                                                 -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -184,6 +184,12 @@
       <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_0_5.MemoryChunks"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_0_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_0_6.MemoryChunks"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -235,6 +241,12 @@
       <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_1_3.MemoryChunks"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_1_4.MemoryChunks"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -276,6 +288,12 @@
       <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_2_4.MemoryChunks"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_2_5.MemoryChunks"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -311,6 +329,12 @@
       <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_3_0.MemoryChunks"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_3_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_3_1.MemoryChunks"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -324,5 +348,11 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryChunks.v1_4_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="MemoryChunks" BaseType="MemoryChunks.v1_4_0.MemoryChunks"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/MemoryMetrics_v1.xml b/static/redfish/v1/schema/MemoryMetrics_v1.xml
index d7a926f..226c857 100644
--- a/static/redfish/v1/schema/MemoryMetrics_v1.xml
+++ b/static/redfish/v1/schema/MemoryMetrics_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MemoryMetrics v1.4.0                                                -->
+<!--# Redfish Schema:  MemoryMetrics v1.4.1                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -56,12 +56,17 @@
           <Collection>
             <String>/redfish/v1/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/MemoryMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/MemoryMetrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -82,7 +87,7 @@
         <Property Name="BlockSizeBytes" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The block size, in bytes."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the block size, in bytes, of all stucture elements.  When this resource is subordinate to the MemorySummary object, this property is not applicable."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the block size, in bytes, of all structure elements.  When this resource is subordinate to the MemorySummary object, this property is not applicable."/>
           <Annotation Term="Measures.Unit" String="By"/>
         </Property>
         <Property Name="CurrentPeriod" Type="MemoryMetrics.v1_0_0.CurrentPeriod" Nullable="false">
@@ -229,7 +234,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version shows that AlarmTrips was modified to add semantics about AlarmTrip resets upon system reset."/>
+      <Annotation Term="OData.Description" String="This version shows that AlarmTrips was modified to add semantics about AlarmTrips resets upon system reset."/>
       <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_2.MemoryMetrics"/>
     </Schema>
 
@@ -256,6 +261,12 @@
       <Annotation Term="OData.Description" String="This version was created to update description HealthData to allow for usage when this resource is subordinate to the MemorySummary object."/>
       <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_6.MemoryMetrics"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_7.MemoryMetrics"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -286,7 +297,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version shows that AlarmTrips was modified to add semantics about AlarmTrip resets upon system reset."/>
+      <Annotation Term="OData.Description" String="This version shows that AlarmTrips was modified to add semantics about AlarmTrips resets upon system reset."/>
       <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_2.MemoryMetrics"/>
     </Schema>
 
@@ -313,6 +324,12 @@
       <Annotation Term="OData.Description" String="This version was created to update description HealthData to allow for usage when this resource is subordinate to the MemorySummary object."/>
       <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_6.MemoryMetrics"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_7.MemoryMetrics"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -335,6 +352,12 @@
       <Annotation Term="OData.Description" String="This version was created to update description HealthData to allow for usage when this resource is subordinate to the MemorySummary object."/>
       <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_2_0.MemoryMetrics"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_2_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_2_1.MemoryMetrics"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -351,6 +374,12 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_3_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_3_0.MemoryMetrics"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -385,5 +414,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_4_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_4_0.MemoryMetrics"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Memory_v1.xml b/static/redfish/v1/schema/Memory_v1.xml
index 9acc901..a7899a7 100644
--- a/static/redfish/v1/schema/Memory_v1.xml
+++ b/static/redfish/v1/schema/Memory_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Memory v1.10.0                                                      -->
+<!--# Redfish Schema:  Memory v1.11.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -37,6 +37,18 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Assembly_v1.xml">
     <edmx:Include Namespace="Assembly"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics_v1.xml">
+    <edmx:Include Namespace="EnvironmentMetrics"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Processor_v1.xml">
+    <edmx:Include Namespace="Processor"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
+    <edmx:Include Namespace="CertificateCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -84,7 +96,7 @@
         </Parameter>
         <Parameter Name="Passphrase" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Description" String="The passphrase required to complete the operation."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the passphrase required to complete this actionn."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the passphrase required to complete this action."/>
         </Parameter>
       </Action>
 
@@ -140,7 +152,7 @@
 
       <Action Name="DisablePassphrase" IsBound="true">
         <Annotation Term="OData.Description" String="Disable passphrase for given regions."/>
-        <Annotation Term="OData.LongDescription" String="This action shall disaple the need for passphrases on the supplied region provided the supplied passphrase matches that of the region."/>
+        <Annotation Term="OData.LongDescription" String="This action shall disable the need for passphrases on the supplied region provided the supplied passphrase matches that of the region."/>
         <Parameter Name="Memory" Type="Memory.v1_0_0.Actions"/>
         <Parameter Name="RegionId" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Description" String="The memory region ID to which to apply this action."/>
@@ -427,8 +439,8 @@
           <Annotation Term="OData.LongDescription" String="This value shall represent an NVDIMM_P memory device as defined by JEDEC."/>
         </Member>
         <Member Name="IntelOptane">
-          <Annotation Term="OData.Description" String="The memory device is an Intel Optane DC Persistent Memory Module."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent an Intel Optane DC Persistent Memory Module."/>
+          <Annotation Term="OData.Description" String="The memory device is an Intel Optane Persistent Memory Module."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent an Intel Optane Persistent Memory Module."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -521,7 +533,7 @@
           </Annotation>
         </Member>
         <Member Name="HBM2">
-          <Annotation Term="OData.Description" String="High Bandwidth Memory 2."/>
+          <Annotation Term="OData.Description" String="The second generation of High Bandwidth Memory."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -531,6 +543,116 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="HBM3">
+          <Annotation Term="OData.Description" String="The third generation of High Bandwidth Memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="GDDR">
+          <Annotation Term="OData.Description" String="Synchronous graphics random-access memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="GDDR2">
+          <Annotation Term="OData.Description" String="Double data rate type two synchronous graphics random-access memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="GDDR3">
+          <Annotation Term="OData.Description" String="Double data rate type three synchronous graphics random-access memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="GDDR4">
+          <Annotation Term="OData.Description" String="Double data rate type four synchronous graphics random-access memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="GDDR5">
+          <Annotation Term="OData.Description" String="Double data rate type five synchronous graphics random-access memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="GDDR5X">
+          <Annotation Term="OData.Description" String="Double data rate type five X synchronous graphics random-access memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="GDDR6">
+          <Annotation Term="OData.Description" String="Double data rate type six synchronous graphics random-access memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="DDR5">
+          <Annotation Term="OData.Description" String="Double data rate type five synchronous dynamic random-access memory."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="OEM">
+          <Annotation Term="OData.Description" String="OEM-defined."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_11_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="BaseModuleType">
@@ -882,6 +1004,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_0_9.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_0_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_0_10.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -948,6 +1076,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_1_8.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_1_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_1_9.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -1053,6 +1187,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_2_7.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_2_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_2_8.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.2"/>
@@ -1133,6 +1273,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_3_7.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_3_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_3_8.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -1223,6 +1369,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_4_7.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_4_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_4_8.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -1280,6 +1432,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_5_6.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_5_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_5_7.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -1324,10 +1482,16 @@
       <EntityType Name="Memory" BaseType="Memory.v1_6_5.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_6_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for the `IntelOptane` value.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_6_6.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
-      <Annotation Term="OData.Description" String="This version was created to add 3DXPoint to the MediaType enum.  It was also created to add SecurityState, add ConfigurationLocked, add 3DXPoint to the MediaType enumerations, and to replace SecurityStates with individual capability properties."/>
+      <Annotation Term="OData.Description" String="This version was created to add 3DXPoint to the MemoryMedia enumeration.  It was also created to add SecurityState, add ConfigurationLocked, and to replace SecurityStates with individual capability properties."/>
 
       <EntityType Name="Memory" BaseType="Memory.v1_6_1.Memory">
         <Property Name="SecurityState" Type="Memory.v1_0_0.SecurityStates">
@@ -1391,6 +1555,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_7_4.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_7_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for the `IntelOptane` value.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_7_5.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -1416,6 +1586,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_8_2.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_8_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for the `IntelOptane` value.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_8_3.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -1442,6 +1618,12 @@
       <EntityType Name="Memory" BaseType="Memory.v1_9_2.Memory"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_9_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for the `IntelOptane` value.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_9_3.Memory"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -1455,5 +1637,55 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_10_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description for the `IntelOptane` value.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="Memory" BaseType="Memory.v1_10_0.Memory"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Memory.v1_11_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to include the processor memory types to the enumerations of MemoryDeviceType, the links to the resource type Processor associated with the memory, and add Model and SparePartNumber.  It was also created to add a link for EnvironmentMetrics."/>
+
+      <EntityType Name="Memory" BaseType="Memory.v1_10_1.Memory">
+        <Property Name="SparePartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The spare part number of the memory."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the spare part number of the memory."/>
+        </Property>
+        <Property Name="Model" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The product model number of this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the model information as provided by the manufacturer of this memory."/>
+        </Property>
+        <NavigationProperty Name="EnvironmentMetrics" Type="EnvironmentMetrics.EnvironmentMetrics" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the environment metrics for this memory."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this memory."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Links" BaseType="Memory.v1_2_0.Links">
+        <NavigationProperty Name="Processors" Type="Collection(Processor.Processor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the processors associated with this memory device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type Processor that are associated with this memory device."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/MessageRegistry_v1.xml b/static/redfish/v1/schema/MessageRegistry_v1.xml
index d656dd4..a05534b 100644
--- a/static/redfish/v1/schema/MessageRegistry_v1.xml
+++ b/static/redfish/v1/schema/MessageRegistry_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MessageRegistry v1.4.1                                              -->
+<!--# Redfish Schema:  MessageRegistry v1.4.2                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -122,7 +122,7 @@
         <Property Name="Severity" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The severity of the message."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the condition resulting in the message, as defined in the Status clause of the Redfish Specification."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the condition resulting in the message, as defined in the 'Status' clause of the Redfish Specification.  Services can replace the severity defined in the message registry with a value more applicable to the implementation in message payloads and event payloads."/>
           <Annotation Term="Redfish.Required"/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
@@ -216,6 +216,12 @@
       <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_0_8.MessageRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that Severity and MessageSeverity can be overridden by the service."/>
+      <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_0_9.MessageRegistry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -273,6 +279,12 @@
       <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_1_4.MessageRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that Severity and MessageSeverity can be overridden by the service."/>
+      <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_1_5.MessageRegistry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -334,6 +346,12 @@
       <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_2_2.MessageRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_2_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that Severity and MessageSeverity can be overridden by the service."/>
+      <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_2_3.MessageRegistry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -372,6 +390,12 @@
       <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_3_1.MessageRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_3_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that Severity and MessageSeverity can be overridden by the service."/>
+      <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_3_2.MessageRegistry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -383,7 +407,7 @@
         <Property Name="MessageSeverity" Type="Resource.Health">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The severity of the message."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the message.  Services can replace the severity defined in the message registry with a value more applicable to the implementation in message payloads and event payloads."/>
           <Annotation Term="Redfish.Required"/>
         </Property>
       </ComplexType>
@@ -395,5 +419,11 @@
       <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_4_0.MessageRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_4_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify that Severity and MessageSeverity can be overridden by the service."/>
+      <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_4_1.MessageRegistry"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Message_v1.xml b/static/redfish/v1/schema/Message_v1.xml
index 989de48..c9a783c 100644
--- a/static/redfish/v1/schema/Message_v1.xml
+++ b/static/redfish/v1/schema/Message_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Message v1.1.1                                                      -->
+<!--# Redfish Schema:  Message v1.1.2                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -44,14 +44,14 @@
       <ComplexType Name="Message" BaseType="Message.Message">
         <Property Name="MessageId" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The key for this message used to find the message in a message registry."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a key into message registry, as described in the Redfish Specification."/>
+          <Annotation Term="OData.Description" String="The identifier for the message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a MessageId, as defined in the 'MessageId format' clause of the Redfish Specification."/>
           <Annotation Term="Redfish.Required"/>
         </Property>
-        <Property Name="Message" Type="Edm.String">
+        <Property Name="Message" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The human-readable message, if provided."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain an optional human-readable message."/>
+          <Annotation Term="OData.Description" String="The human-readable message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a human-readable message."/>
         </Property>
         <Property Name="RelatedProperties" Type="Collection(Edm.String)" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -60,13 +60,13 @@
         </Property>
         <Property Name="MessageArgs" Type="Collection(Edm.String)" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="This array of message arguments are substituted for the arguments in the message when looked up in the message registry."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the message substitution arguments for the specific message to which this MessageId refers and shall be included only if the MessageId is present.  Any number and integer type arguments shall be converted to strings."/>
+          <Annotation Term="OData.Description" String="An array of message arguments that are substituted for the arguments in the message when looked up in the message registry."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of message arguments that are substituted for the arguments in the message when looked up in the message registry.  It has the same semantics as the MessageArgs property in the Redfish MessageRegistry schema."/>
         </Property>
-        <Property Name="Severity" Type="Edm.String">
+        <Property Name="Severity" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The severity of the errors."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the error, as defined in the Status section of the Redfish Specification.  Services can replace the value defined in the message registry with a value more applicable to the implementation."/>
+          <Annotation Term="OData.Description" String="The severity of the message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the message, as defined in the 'Status' clause of the Redfish Specification.  Services can replace the value defined in the message registry with a value more applicable to the implementation."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -77,9 +77,9 @@
             </Collection>
           </Annotation>
         </Property>
-        <Property Name="Resolution" Type="Edm.String">
+        <Property Name="Resolution" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="Used to provide suggestions on how to resolve the situation that caused the error."/>
+          <Annotation Term="OData.Description" String="Used to provide suggestions on how to resolve the situation that caused the message."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the resolution of the message.  Services can replace the resolution defined in the message registry with a more specific resolution in message payloads."/>
         </Property>
         <Property Name="Oem" Type="Resource.Oem" Nullable="false">
@@ -137,13 +137,19 @@
       <ComplexType Name="Message" BaseType="Message.v1_0_8.Message"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Message.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas."/>
+      <ComplexType Name="Message" BaseType="Message.v1_0_9.Message"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Message.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
       <Annotation Term="OData.Description" String="This version was created to deprecate the Severity property and replace it with the MessageSeverity property, in order to tie the values to those used for the Health property within Status."/>
 
       <ComplexType Name="Message" BaseType="Message.v1_0_8.Message">
-        <Property Name="MessageSeverity" Type="Resource.Health">
+        <Property Name="MessageSeverity" Type="Resource.Health" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The severity of the message."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the message.  Services can replace the value defined in the message registry with a value more applicable to the implementation."/>
@@ -157,5 +163,11 @@
       <ComplexType Name="Message" BaseType="Message.v1_1_0.Message"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Message.v1_1_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description for MessageId, and to align descriptions between the Message and Event schemas."/>
+      <ComplexType Name="Message" BaseType="Message.v1_1_1.Message"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/MetricDefinition_v1.xml b/static/redfish/v1/schema/MetricDefinition_v1.xml
index 56752fc..ba752c6 100644
--- a/static/redfish/v1/schema/MetricDefinition_v1.xml
+++ b/static/redfish/v1/schema/MetricDefinition_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MetricDefinition v1.1.0                                             -->
+<!--# Redfish Schema:  MetricDefinition v1.1.1                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -197,7 +197,7 @@
         <Property Name="DiscreteValues" Type="Collection(Edm.String)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="This array property specifies possible values of a discrete metric."/>
-          <Annotation Term="OData.LongDescription" String="The values of the property shall specify the possible values of the discrete metic.  This property shall have values when the MetricType property is `Discrete`."/>
+          <Annotation Term="OData.LongDescription" String="The values of the property shall specify the possible values of the discrete metric.  This property shall have values when the MetricType property is `Discrete`."/>
         </Property>
 
         <Property Name="Precision" Type="Edm.Int64">
@@ -253,12 +253,12 @@
         <Property Name="SourceMetric" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The metric property used as the input into the calculation.  If the link has wildcards, the wildcards are substituted as specified in the Wildcards array property."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a metric property used in a calcuation.  A set of curly braces shall delimit each wildcard in the URI.  The corresponding entry in the Wildcard property shall replace each wildcard.  After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies.  The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a metric property used in a calculation.  A set of curly braces shall delimit each wildcard in the URI.  The corresponding entry in the Wildcard property shall replace each wildcard.  After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies.  The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules."/>
         </Property>
         <Property Name="ResultMetric" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The link to a metric property that stores the result of the calculation.  If the link has wildcards, the wildcards are substituted as specified in the Wildcards array property."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a metric property that stores the result of the calcuation.  A set of curly braces shall delimit each wildcard in the URI.  The corresponding entry in the Wildcard property shall replace each wildcard.  After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies.  The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a metric property that stores the result of the calculation.  A set of curly braces shall delimit each wildcard in the URI.  The corresponding entry in the Wildcard property shall replace each wildcard.  After a URI with wildcards replaces its wildcards, it shall identify a resource property to which the metric definition applies.  The property identifiers portion of the URI shall follow RFC6901-defined JSON fragment notation rules."/>
         </Property>
       </ComplexType>
 
@@ -351,6 +351,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions for CalculationParameters."/>
       <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_0_4.MetricDefinition"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_0_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_0_5.MetricDefinition"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -365,6 +371,12 @@
         </Property>
       </EntityType>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_1_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_1_0.MetricDefinition"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/MetricReportDefinition_v1.xml b/static/redfish/v1/schema/MetricReportDefinition_v1.xml
index 7f5b139..236cd0f 100644
--- a/static/redfish/v1/schema/MetricReportDefinition_v1.xml
+++ b/static/redfish/v1/schema/MetricReportDefinition_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MetricReportDefinition v1.3.3                                       -->
+<!--# Redfish Schema:  MetricReportDefinition v1.4.0                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -161,7 +161,7 @@
 
         <Property Name="MetricId" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="The label for the metric definition that is derived by applying the collectionFunction to the metric property.  It matches the Id property of the corresponding metric definition."/>
+          <Annotation Term="OData.Description" String="The label for the metric definition that is derived by applying the CollectionFunction to the metric property.  It matches the Id property of the corresponding metric definition."/>
           <Annotation Term="OData.LongDescription" String="This property shall specify the label for the metric definition that is derived by applying the algorithm specified in the CollectionFunction property to the metric property.  This property shall match the Id property of the corresponding metric definition."/>
         </Property>
         <Property Name="MetricProperties" Type="Collection(Edm.String)">
@@ -304,7 +304,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_0_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to correct descriptions in the CalculationAlgorithmEnum enum.  It was also created to update descriptions that this schema defines."/>
+      <Annotation Term="OData.Description" String="This version was created to correct descriptions in the CalculationAlgorithmEnum enumeration.  It was also created to update descriptions that this schema defines."/>
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_0_2.MetricReportDefinition"/>
     </Schema>
 
@@ -326,6 +326,12 @@
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_0_5.MetricReportDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_0_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_0_6.MetricReportDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_1_0">
       <Annotation Term="OData.Description" String="This version was created to add the Values property to the Wildcard property."/>
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -348,7 +354,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_1_2">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to correct descriptions in the CalculationAlgorithmEnum enum.  It was also created to update descriptions that this schema defines."/>
+      <Annotation Term="OData.Description" String="This version was created to correct descriptions in the CalculationAlgorithmEnum enumeration.  It was also created to update descriptions that this schema defines."/>
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_1_1.MetricReportDefinition"/>
     </Schema>
 
@@ -370,6 +376,12 @@
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_1_4.MetricReportDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_1_5.MetricReportDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -410,7 +422,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_2_1">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to correct descriptions in the CalculationAlgorithmEnum enum.  It was also created to update descriptions that this schema defines."/>
+      <Annotation Term="OData.Description" String="This version was created to correct descriptions in the CalculationAlgorithmEnum enumeration.  It was also created to update descriptions that this schema defines."/>
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_2_0.MetricReportDefinition"/>
     </Schema>
 
@@ -432,6 +444,12 @@
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_2_3.MetricReportDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_2_4.MetricReportDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -463,5 +481,25 @@
       <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_3_2.MetricReportDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_3_3.MetricReportDefinition"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReportDefinition.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="MetricReportDefinition" BaseType="MetricReportDefinition.v1_3_4.MetricReportDefinition"/>
+
+      <ComplexType Name="Metric" BaseType="MetricReportDefinition.v1_0_0.Metric">
+        <Property Name="Oem" Type="Resource.Oem" Nullable="false">
+          <Annotation Term="OData.Description" String="The OEM extension property."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/MetricReport_v1.xml b/static/redfish/v1/schema/MetricReport_v1.xml
index 6760e4f..9ddf00a 100644
--- a/static/redfish/v1/schema/MetricReport_v1.xml
+++ b/static/redfish/v1/schema/MetricReport_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  MetricReport v1.4.0                                                 -->
+<!--# Redfish Schema:  MetricReport v1.4.1                                                 -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -37,8 +37,8 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
 
       <EntityType Name="MetricReport" BaseType="Resource.v1_0_0.Resource" Abstract="true">
-        <Annotation Term="OData.Description" String="The metric definitions that create a metric report."/>
-        <Annotation Term="OData.LongDescription" String="The definition for this metric report."/>
+        <Annotation Term="OData.Description" String="The MetricReport schema represents a set of collected metrics."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a metric report in a Redfish implementation.  When a metric report is deleted, the historic metric data used to generate the report shall be deleted as well unless other metric reports are consuming the data."/>
         <Annotation Term="Capabilities.InsertRestrictions">
           <Record>
             <PropertyValue Property="Insertable" Bool="false"/>
@@ -178,6 +178,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_0_4.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_0_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify behavior for when a metric report is deleted."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_0_5.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -216,6 +222,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_1_3.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify behavior for when a metric report is deleted."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_1_4.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -242,6 +254,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_2_1.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_2_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify behavior for when a metric report is deleted."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_2_2.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -256,6 +274,12 @@
       <EntityType Name="MetricReport" BaseType="MetricReport.v1_3_0.MetricReport"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_3_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify behavior for when a metric report is deleted."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_3_1.MetricReport"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -269,5 +293,11 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricReport.v1_4_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify behavior for when a metric report is deleted."/>
+      <EntityType Name="MetricReport" BaseType="MetricReport.v1_4_0.MetricReport"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/NetworkAdapter_v1.xml b/static/redfish/v1/schema/NetworkAdapter_v1.xml
index 5c88474..ac130e1 100644
--- a/static/redfish/v1/schema/NetworkAdapter_v1.xml
+++ b/static/redfish/v1/schema/NetworkAdapter_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  NetworkAdapter v1.5.0                                               -->
+<!--# Redfish Schema:  NetworkAdapter v1.6.0                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -48,6 +48,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Port_v1.xml">
     <edmx:Include Namespace="Port"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
+    <edmx:Include Namespace="CertificateCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -349,6 +355,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_0_5.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_0_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_0_6.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -400,6 +412,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_1_4.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_1_5.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -459,6 +477,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_2_3.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_2_4.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -490,6 +514,12 @@
       <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_3_2.NetworkAdapter"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_3_3.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -506,6 +536,12 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_4_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_4_0.NetworkAdapter"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -527,7 +563,32 @@
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
       </ComplexType>
-    </Schema>   
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_5_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_5_0.NetworkAdapter"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkAdapter.v1_6_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Certificates and Measurements to devices for attestation and identity management."/>
+
+      <EntityType Name="NetworkAdapter" BaseType="NetworkAdapter.v1_5_1.NetworkAdapter">
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/NetworkDeviceFunction_v1.xml b/static/redfish/v1/schema/NetworkDeviceFunction_v1.xml
index c378072..4adb4bb 100644
--- a/static/redfish/v1/schema/NetworkDeviceFunction_v1.xml
+++ b/static/redfish/v1/schema/NetworkDeviceFunction_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  NetworkDeviceFunction v1.5.0                                        -->
+<!--# Redfish Schema:  NetworkDeviceFunction v1.5.1                                        -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -125,7 +125,7 @@
               <Record>
                 <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
                 <PropertyValue Property="Version" String="v1_5_0"/>
-                <PropertyValue Property="Description" String="This property has been deprecated in favor of the AssignablePhysicalNetowrkPorts property."/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of the AssignablePhysicalNetworkPorts property."/>
               </Record>
             </Collection>
           </Annotation>
@@ -243,7 +243,7 @@
         </Property>
       </ComplexType>
 
-      <ComplexType Name="Links">
+      <ComplexType Name="Links" BaseType="Resource.Links">
         <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
         <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
         <NavigationProperty Name="PCIeFunction" Type="PCIeFunction.PCIeFunction" Nullable="false">
@@ -380,7 +380,7 @@
         <Property Name="CHAPUsername" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The user name for CHAP authentication."/>
-          <Annotation Term="OData.LongDescription" String="This property shall containhe user name for CHAP authentication."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the user name for CHAP authentication."/>
         </Property>
         <Property Name="CHAPSecret" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -484,16 +484,16 @@
           <Annotation Term="OData.Description" String="Do not indicate to UEFI/BIOS that this device is bootable."/>
         </Member>
         <Member Name="PXE">
-          <Annotation Term="OData.Description" String="Boot this device by using the embedded PXE support.  Only applicable if the NetworkDeviceFunctionType is `Ethernet` or `InfiniBand`."/>
+          <Annotation Term="OData.Description" String="Boot this device by using the embedded PXE support.  Only applicable if the NetDevFuncType is `Ethernet` or `InfiniBand`."/>
         </Member>
         <Member Name="iSCSI">
-          <Annotation Term="OData.Description" String="Boot this device by using the embedded iSCSI boot support and configuration.  Only applicable if the NetworkDeviceFunctionType is `iSCSI`."/>
+          <Annotation Term="OData.Description" String="Boot this device by using the embedded iSCSI boot support and configuration.  Only applicable if the NetDevFuncType is `iSCSI` or `Ethernet`."/>
         </Member>
         <Member Name="FibreChannel">
-          <Annotation Term="OData.Description" String="Boot this device by using the embedded Fibre Channel support and configuration.  Only applicable if the NetworkDeviceFunctionType is `FibreChannel`."/>
+          <Annotation Term="OData.Description" String="Boot this device by using the embedded Fibre Channel support and configuration.  Only applicable if the NetDevFuncType is `FibreChannel`."/>
         </Member>
         <Member Name="FibreChannelOverEthernet">
-          <Annotation Term="OData.Description" String="Boot this device by using the embedded Fibre Channel over Ethernet (FCoE) boot support and configuration.  Only applicable if the NetworkDeviceFunctionType is `FibreChannelOverEthernet`."/>
+          <Annotation Term="OData.Description" String="Boot this device by using the embedded Fibre Channel over Ethernet (FCoE) boot support and configuration.  Only applicable if the NetDevFuncType is `FibreChannelOverEthernet`."/>
         </Member>
       </EnumType>
     </Schema>
@@ -540,6 +540,12 @@
       <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_0_6.NetworkDeviceFunction"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description of the `iSCSI` boot mode to allow for `Ethernet`.  It was also created to correct the definition for Links to leverage the common definition found in the Resource schema.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_0_7.NetworkDeviceFunction"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -604,6 +610,12 @@
       <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_1_5.NetworkDeviceFunction"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_1_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description of the `iSCSI` boot mode to allow for `Ethernet`.  It was also created to correct the definition for Links to leverage the common definition found in the Resource schema.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_1_6.NetworkDeviceFunction"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -656,6 +668,12 @@
       <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_2_5.NetworkDeviceFunction"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_2_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description of the `iSCSI` boot mode to allow for `Ethernet`.  It was also created to correct the definition for Links to leverage the common definition found in the Resource schema.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_2_6.NetworkDeviceFunction"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -726,6 +744,12 @@
       <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_3_3.NetworkDeviceFunction"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description of the `iSCSI` boot mode to allow for `Ethernet`.  It was also created to correct the definition for Links to leverage the common definition found in the Resource schema.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_3_4.NetworkDeviceFunction"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -748,6 +772,12 @@
       <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_4_0.NetworkDeviceFunction"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_4_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description of the `iSCSI` boot mode to allow for `Ethernet`.  It was also created to correct the definition for Links to leverage the common definition found in the Resource schema.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_4_1.NetworkDeviceFunction"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -789,8 +819,8 @@
 
       <ComplexType Name="InfiniBand">
         <Annotation Term="OData.AdditionalProperties" Bool="false"/>
-        <Annotation Term="OData.Description" String="This type describes InifiniBand capabilities, status, and configuration of a network device function."/>
-        <Annotation Term="OData.LongDescription" String="This type shall describe the InifiniBand capabilities, status, and configuration values for a network device function."/>
+        <Annotation Term="OData.Description" String="This type describes InfiniBand capabilities, status, and configuration of a network device function."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe the InfiniBand capabilities, status, and configuration values for a network device function."/>
         <Property Name="PermanentPortGUID" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The permanent port GUID assigned to this network device function."/>
@@ -840,5 +870,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkDeviceFunction.v1_5_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the description of the `iSCSI` boot mode to allow for `Ethernet`.  It was also created to correct the definition for Links to leverage the common definition found in the Resource schema.  It was also created to fix typos in descriptions and long descriptions."/>
+      <EntityType Name="NetworkDeviceFunction" BaseType="NetworkDeviceFunction.v1_5_0.NetworkDeviceFunction"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/NetworkInterface_v1.xml b/static/redfish/v1/schema/NetworkInterface_v1.xml
index afc8930..959275a 100644
--- a/static/redfish/v1/schema/NetworkInterface_v1.xml
+++ b/static/redfish/v1/schema/NetworkInterface_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  NetworkInterface v1.2.0                                             -->
+<!--# Redfish Schema:  NetworkInterface v1.2.1                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -43,7 +43,7 @@
 
       <EntityType Name="NetworkInterface" BaseType="Resource.v1_0_0.Resource" Abstract="true">
         <Annotation Term="OData.Description" String="The NetworkInterface schema describes links to the network adapters, network ports, and network device functions, and represents the functionality available to the containing system."/>
-        <Annotation Term="OData.LongDescription" String="This resource contains links to the network adapters, network porta, and network device functions, and represents the functionality available to the containing system."/>
+        <Annotation Term="OData.LongDescription" String="This resource contains links to the network adapters, network ports, and network device functions, and represents the functionality available to the containing system."/>
         <Annotation Term="Capabilities.InsertRestrictions">
           <Record>
             <PropertyValue Property="Insertable" Bool="false"/>
@@ -148,6 +148,12 @@
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
       <EntityType Name="NetworkInterface" BaseType="NetworkInterface.v1_0_4.NetworkInterface"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkInterface.v1_0_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="NetworkInterface" BaseType="NetworkInterface.v1_0_5.NetworkInterface"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkInterface.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -200,6 +206,12 @@
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
       <EntityType Name="NetworkInterface" BaseType="NetworkInterface.v1_1_3.NetworkInterface"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkInterface.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="NetworkInterface" BaseType="NetworkInterface.v1_1_4.NetworkInterface"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkInterface.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -214,6 +226,12 @@
         </NavigationProperty>
       </EntityType>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkInterface.v1_2_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="NetworkInterface" BaseType="NetworkInterface.v1_2_0.NetworkInterface"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/NetworkPortCollection_v1.xml b/static/redfish/v1/schema/NetworkPortCollection_v1.xml
index 33b4055..ddf410a 100644
--- a/static/redfish/v1/schema/NetworkPortCollection_v1.xml
+++ b/static/redfish/v1/schema/NetworkPortCollection_v1.xml
@@ -60,6 +60,15 @@
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/NetworkPorts</String>
           </Collection>
         </Annotation>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+              <PropertyValue Property="Version" String="2020.4"/>
+              <PropertyValue Property="Description" String="This schema has been deprecated in favor of the PortCollection schema."/>
+            </Record>
+          </Collection>
+        </Annotation>
         <NavigationProperty Name="Members" Type="Collection(NetworkPort.NetworkPort)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The members of this collection."/>
diff --git a/static/redfish/v1/schema/NetworkPort_v1.xml b/static/redfish/v1/schema/NetworkPort_v1.xml
index 036b5c3..d42cff1 100644
--- a/static/redfish/v1/schema/NetworkPort_v1.xml
+++ b/static/redfish/v1/schema/NetworkPort_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  NetworkPort v1.3.0                                                  -->
+<!--# Redfish Schema:  NetworkPort v1.4.0                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -60,6 +60,15 @@
             <String>/redfish/v1/Chassis/{ChassisId}/NetworkAdapters/{NetworkAdapterId}/NetworkPorts/{NetworkPortId}</String>
           </Collection>
         </Annotation>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+              <PropertyValue Property="Version" String="v1_4_0"/>
+              <PropertyValue Property="Description" String="This schema has been deprecated in favor of the Port schema."/>
+            </Record>
+          </Collection>
+        </Annotation>
       </EntityType>
     </Schema>
 
@@ -142,7 +151,7 @@
       </EntityType>
 
       <ComplexType Name="SupportedLinkCapabilities">
-        <Annotation Term="OData.Description" String="The link capabilities of an assocaited port."/>
+        <Annotation Term="OData.Description" String="The link capabilities of an associated port."/>
         <Annotation Term="OData.LongDescription" String="This type shall describe the static capabilities of an associated port, irrespective of transient conditions such as cabling, interface module presence, or remote link partner status or configuration."/>
         <Property Name="LinkNetworkTechnology" Type="NetworkPort.v1_0_0.LinkNetworkTechnology">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -309,6 +318,12 @@
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
       <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_0_6.NetworkPort"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkPort.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_0_7.NetworkPort"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkPort.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -373,6 +388,12 @@
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
       <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_1_5.NetworkPort"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkPort.v1_1_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_1_6.NetworkPort"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkPort.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -481,6 +502,12 @@
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
       <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_2_4.NetworkPort"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkPort.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_2_5.NetworkPort"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkPort.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -489,6 +516,20 @@
 
       <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_2_4.NetworkPort"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkPort.v1_3_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_3_0.NetworkPort"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="NetworkPort.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to deprecate the schema."/>
+
+      <EntityType Name="NetworkPort" BaseType="NetworkPort.v1_3_1.NetworkPort"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/OperatingConfig_v1.xml b/static/redfish/v1/schema/OperatingConfig_v1.xml
index 8c00bac..25ae608 100644
--- a/static/redfish/v1/schema/OperatingConfig_v1.xml
+++ b/static/redfish/v1/schema/OperatingConfig_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  OperatingConfig v1.0.1                                              -->
+<!--# Redfish Schema:  OperatingConfig v1.0.2                                              -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -179,5 +179,11 @@
       <EntityType Name="OperatingConfig" BaseType="OperatingConfig.v1_0_0.OperatingConfig"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="OperatingConfig.v1_0_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="OperatingConfig" BaseType="OperatingConfig.v1_0_1.OperatingConfig"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Outlet_v1.xml b/static/redfish/v1/schema/Outlet_v1.xml
index 7d42b61..b5f3c89 100644
--- a/static/redfish/v1/schema/Outlet_v1.xml
+++ b/static/redfish/v1/schema/Outlet_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Outlet v1.1.0                                                       -->
+<!--# Redfish Schema:  Outlet v1.1.1                                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -324,37 +324,37 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 1 to Line 2 voltage reading for this outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L1 and L2.  This property shall not be present if the outlet does not include an L1-L2 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L1 and L2.  This property shall not be present if the outlet does not include an L1-L2 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2ToLine3" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 2 to Line 3 voltage reading for this outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L2 and L3.  This property shall not be present if the outlet does not include an L2-L3 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L2 and L3.  This property shall not be present if the outlet does not include an L2-L3 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3ToLine1" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 3 to Line 1 voltage reading for this outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L3 and L1.  This property shall not be present if the outlet does not include an L3-L1 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L3 and L1.  This property shall not be present if the outlet does not include an L3-L1 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line1ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 1 to Neutral voltage reading for this outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L1 and Neutral.  This property shall not be present if the outlet does not include an L1-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L1 and Neutral.  This property shall not be present if the outlet does not include an L1-Neutral measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 2 to Neutral voltage reading for this outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L2 and Neutral.  This property shall not be present if the outlet does not include an L2-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L2 and Neutral.  This property shall not be present if the outlet does not include an L2-Neutral measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3ToNeutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
           <Annotation Term="OData.Description" String="The Line 3 to Neutral voltage reading for this outlet."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a VoltageSensor excerpt that measures voltage between L3 and Neutral.  This property shall not be present if the outlet does not include an L3-Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Voltage that measures voltage between L3 and Neutral.  This property shall not be present if the outlet does not include an L3-Neutral measurement."/>
         </NavigationProperty>
       </ComplexType>
 
@@ -366,25 +366,25 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
           <Annotation Term="OData.Description" String="Line 1 current sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a CurrentSensor excerpt that measures current for L1.  This property shall not be present if the outlet does not include an L1 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Current that measures current for L1.  This property shall not be present if the outlet does not include an L1 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line2" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
           <Annotation Term="OData.Description" String="Line 2 current sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a CurrentSensor excerpt that measures current for L2.  This property shall not be present if the outlet does not include an L2 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Current that measures current for L2.  This property shall not be present if the outlet does not include an L2 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Line3" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
           <Annotation Term="OData.Description" String="Line 3 current sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a CurrentSensor excerpt that measures current for L3.  This property shall not be present if the outlet does not include an L3 measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Current that measures current for L3.  This property shall not be present if the outlet does not include an L3 measurement."/>
         </NavigationProperty>
         <NavigationProperty Name="Neutral" Type="Sensor.Sensor">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
           <Annotation Term="OData.Description" String="Neutral line current sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a CurrentSensor excerpt that measures current for the Neutral line.  This property shall not be present if the outlet does not include a Neutral measurement."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a Sensor excerpt of type Current that measures current for the Neutral line.  This property shall not be present if the outlet does not include a Neutral measurement."/>
         </NavigationProperty>
       </ComplexType>
 
@@ -404,6 +404,12 @@
       <EntityType Name="Outlet" BaseType="Outlet.v1_0_0.Outlet"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_0_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Outlet" BaseType="Outlet.v1_0_1.Outlet"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -419,5 +425,11 @@
 
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Outlet.v1_1_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Outlet" BaseType="Outlet.v1_1_0.Outlet"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/PCIeDevice_v1.xml b/static/redfish/v1/schema/PCIeDevice_v1.xml
index f16f4d0..45e03e5 100644
--- a/static/redfish/v1/schema/PCIeDevice_v1.xml
+++ b/static/redfish/v1/schema/PCIeDevice_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  PCIeDevice v1.5.0                                                   -->
+<!--# Redfish Schema:  PCIeDevice v1.6.0                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -390,5 +390,18 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeDevice.v1_6_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="PCIeDevice" BaseType="PCIeDevice.v1_5_0.PCIeDevice">
+        <Property Name="SparePartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The spare part number of the PCIe device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the spare part number of the PCIe device."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/PCIeSlots_v1.xml b/static/redfish/v1/schema/PCIeSlots_v1.xml
index 0165c4a..5b74bfa 100644
--- a/static/redfish/v1/schema/PCIeSlots_v1.xml
+++ b/static/redfish/v1/schema/PCIeSlots_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  PCIeSlots v1.4.0                                                    -->
+<!--# Redfish Schema:  PCIeSlots v1.4.1                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -243,29 +243,38 @@
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeSlots.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
-      <Annotation Term="OData.Description" String="This version was created to add the Open Compute Project 3.0 form factors to PCIeSlotType."/>
+      <Annotation Term="OData.Description" String="This version was created to add the Open Compute Project 3.0 form factors to PCIe SlotType."/>
       <EntityType Name="PCIeSlots" BaseType="PCIeSlots.v1_1_2.PCIeSlots"/>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeSlots.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
-      <Annotation Term="OData.Description" String="This version was created to add the U.2 form factor to PCIeSlotType."/>
+      <Annotation Term="OData.Description" String="This version was created to add the U.2 form factor to PCIe SlotType."/>
       <EntityType Name="PCIeSlots" BaseType="PCIeSlots.v1_2_0.PCIeSlots"/>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeSlots.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add the LocationIndicatorActive property, but the property was incorrectly defined at the root of the resource rather than part of the PCIeSlot array.  The definition for LocationIndicatorActive was corrected in v1_4_1."/>
 
-      <EntityType Name="PCIeSlots" BaseType="PCIeSlots.v1_3_0.PCIeSlots">
+      <EntityType Name="PCIeSlots" BaseType="PCIeSlots.v1_3_0.PCIeSlots"/>
+
+      <ComplexType Name="PCIeSlot" BaseType="PCIeSlots.v1_1_0.PCIeSlot">
         <Property Name="LocationIndicatorActive" Type="Edm.Boolean">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An indicator allowing an operator to physically locate this resource."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the state of the indicator used to physically identify or locate this resource.  A write to this property shall update the value of IndicatorLED in this resource, if supported, to reflect the implementation of the locating function."/>
         </Property>
-      </EntityType>
-
+      </ComplexType>
     </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeSlots.v1_4_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct the definition of the LocationIndicatorActive property."/>
+      <EntityType Name="PCIeSlots" BaseType="PCIeSlots.v1_4_0.PCIeSlots"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/PhysicalContext_v1.xml b/static/redfish/v1/schema/PhysicalContext_v1.xml
index c15a054..6f11983 100644
--- a/static/redfish/v1/schema/PhysicalContext_v1.xml
+++ b/static/redfish/v1/schema/PhysicalContext_v1.xml
@@ -327,6 +327,17 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="TrustedModule">
+          <Annotation Term="OData.Description" String="A trusted module."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2020.4"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <EnumType Name="PhysicalSubContext">
diff --git a/static/redfish/v1/schema/PortCollection_v1.xml b/static/redfish/v1/schema/PortCollection_v1.xml
index 3b1af1e..274d9d9 100644
--- a/static/redfish/v1/schema/PortCollection_v1.xml
+++ b/static/redfish/v1/schema/PortCollection_v1.xml
@@ -53,19 +53,26 @@
         <Annotation Term="Redfish.Uris">
           <Collection>
             <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Ports</String>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerMemberId}/Ports</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports</String>
             <String>/redfish/v1/Chassis/{ChassisId}/MediaControllers/{MediaControllerId}/Ports</String>
             <String>/redfish/v1/Chassis/{ChassisId}/NetworkAdapters/{NetworkAdapterId}/Ports</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerMemberId}/Ports</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/NetworkInterfaces/{NetworkInterfaceId}/Ports</String>
-            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerMemberId}/Ports</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerMemberId}/Ports</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/NetworkInterfaces/{NetworkInterfaceId}/Ports</String>
-            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerMemberId}/Ports</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/NetworkInterfaces/{NetworkInterfaceId}/Ports</String>
+            <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports</String>
+            <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports</String>
           </Collection>
         </Annotation>
         <NavigationProperty Name="Members" Type="Collection(Port.Port)">
diff --git a/static/redfish/v1/schema/PortMetrics_v1.xml b/static/redfish/v1/schema/PortMetrics_v1.xml
index 79c7c92..fe21c5d 100644
--- a/static/redfish/v1/schema/PortMetrics_v1.xml
+++ b/static/redfish/v1/schema/PortMetrics_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  PortMetrics v1.0.0                                                  -->
+<!--# Redfish Schema:  PortMetrics v1.0.1                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -86,7 +86,7 @@
         <Property Name="PacketCRCErrors" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The total number of PCRC transient errors detected."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of PCRC transient errors detected in received link-local and end-to-ent packets."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of PCRC transient errors detected in received link-local and end-to-end packets."/>
         </Property>
         <Property Name="EndToEndCRCErrors" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -96,7 +96,7 @@
         <Property Name="RXStompedECRC" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The total number of packets received with a stomped ECRC field."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of packets that thsi interface received with a stomped ECRC field."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of packets that this interface received with a stomped ECRC field."/>
         </Property>
         <Property Name="TXStompedECRC" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -157,5 +157,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PortMetrics.v1_0_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="PortMetrics" BaseType="PortMetrics.v1_0_0.PortMetrics"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Port_v1.xml b/static/redfish/v1/schema/Port_v1.xml
index 2097fa8..f7fd345 100644
--- a/static/redfish/v1/schema/Port_v1.xml
+++ b/static/redfish/v1/schema/Port_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Port v1.4.0                                                         -->
+<!--# Redfish Schema:  Port v1.3.1                                                         -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -72,13 +72,20 @@
           <Collection>
             <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Ports/{PortId}</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/Chassis/{ChassisId}/MediaControllers/{MediaControllerId}/Ports/{PortId}</String>
             <String>/redfish/v1/Chassis/{ChassisId}/NetworkAdapters/{NetworkAdapterId}/Ports/{PortId}</String>
+            <String>/redfish/v1/Storage/{StorageId}/StorageControllers/{StorageControllerId}/Ports/{PortId}</String>
+            <String>/redfish/v1/Storage/{StorageId}/Controllers/{StorageControllerId}/Ports/{PortId}</String>
           </Collection>
         </Annotation>
       </EntityType>
@@ -248,6 +255,12 @@
       <EntityType Name="Port" BaseType="Port.v1_0_6.Port"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Port" BaseType="Port.v1_0_7.Port"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -284,6 +297,12 @@
       <EntityType Name="Port" BaseType="Port.v1_1_3.Port"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Port" BaseType="Port.v1_1_4.Port"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -438,6 +457,12 @@
       <EntityType Name="Port" BaseType="Port.v1_2_1.Port"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_2_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Port" BaseType="Port.v1_2_2.Port"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -600,5 +625,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Port.v1_3_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Port" BaseType="Port.v1_3_0.Port"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/PowerDistribution_v1.xml b/static/redfish/v1/schema/PowerDistribution_v1.xml
index 6a93f20..7584d78 100644
--- a/static/redfish/v1/schema/PowerDistribution_v1.xml
+++ b/static/redfish/v1/schema/PowerDistribution_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  PowerDistribution v1.0.1                                            -->
+<!--# Redfish Schema:  PowerDistribution v1.0.2                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -397,5 +397,11 @@
       <EntityType Name="PowerDistribution" BaseType="PowerDistribution.v1_0_0.PowerDistribution"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerDistribution.v1_0_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="PowerDistribution" BaseType="PowerDistribution.v1_0_1.PowerDistribution"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/PowerSubsystem_v1.xml b/static/redfish/v1/schema/PowerSubsystem_v1.xml
new file mode 100644
index 0000000..93f018f
--- /dev/null
+++ b/static/redfish/v1/schema/PowerSubsystem_v1.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  PowerSubsystem v1.0.0                                               -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml">
+    <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_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/Redundancy_v1.xml">
+    <edmx:Include Namespace="Redundancy"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSubsystem">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="PowerSubsystem" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="This PowerSubsystem schema contains the definition for the power subsystem of a chassis."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a power subsystem for a Redfish implementation."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/PowerSubsystem</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSubsystem.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="PowerSubsystem" BaseType="PowerSubsystem.PowerSubsystem">
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <Property Name="CapacityWatts" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total amount of power that can be allocated to this subsystem.  This value can be either the power supply capacity or the power budget that an upstream chassis assigns to this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall represent the total power capacity that can be allocated to this subsystem."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+          <Annotation Term="Measures.Unit" String="W"/>
+        </Property>
+        <Property Name="Allocation" Type="PowerSubsystem.v1_0_0.PowerAllocation" Nullable="false">
+          <Annotation Term="OData.Description" String="Power allocation for this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the set of properties describing the allocation of power for this subsystem."/>
+        </Property>
+        <NavigationProperty Name="PowerSupplies" Type="PowerSupplyCollection.PowerSupplyCollection" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the collection of power supplies within this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type PowerSupplyCollection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="PowerSupplyRedundancy" Type="Collection(Redundancy.RedundantGroup)" Nullable="false">
+          <Annotation Term="OData.Description" String="The redundancy information for the set of power supplies in this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain redundancy information for the set of power supplies in this subsystem.  The values of the RedundancyGroup array shall reference resources of type PowerSupply."/>
+        </Property>
+        <Property Name="Actions" Type="PowerSubsystem.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="The Actions property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="PowerAllocation">
+        <Annotation Term="OData.Description" String="Power allocation for a subsystem."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the set of properties describing the allocation of power for a subsystem."/>
+        <Property Name="RequestedWatts" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The potential power, in watts, that the subsystem requests, which might be higher than the current level being consumed because the requested power includes a budget that the subsystem wants for future use."/>
+          <Annotation Term="OData.LongDescription" String="This property shall represent the amount of power, in watts, that the subsystem currently requests to be budgeted for future use."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+          <Annotation Term="Measures.Unit" String="W"/>
+        </Property>
+        <Property Name="AllocatedWatts" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total amount of power that has been allocated or budgeted to this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall represent the total power currently allocated or budgeted to this subsystem."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+          <Annotation Term="Measures.Unit" String="W"/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="PowerSubsystem.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="This property contains the available OEM specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any additional OEM actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain any additional OEM actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/PowerSupplyCollection_v1.xml b/static/redfish/v1/schema/PowerSupplyCollection_v1.xml
new file mode 100644
index 0000000..c0cbb1d
--- /dev/null
+++ b/static/redfish/v1/schema/PowerSupplyCollection_v1.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  PowerSupplyCollection                                               -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerSupply_v1.xml">
+    <edmx:Include Namespace="PowerSupply"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSupplyCollection">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="PowerSupplyCollection" BaseType="Resource.v1_0_0.ResourceCollection">
+        <Annotation Term="OData.Description" String="The collection of PowerSupply resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a resource collection of PowerSupply instances for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/PowerSubsystem/PowerSupplies</String>
+          </Collection>
+        </Annotation>
+        <NavigationProperty Name="Members" Type="Collection(PowerSupply.PowerSupply)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The members of this collection."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this collection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/PowerSupplyMetrics_v1.xml b/static/redfish/v1/schema/PowerSupplyMetrics_v1.xml
new file mode 100644
index 0000000..54daa28
--- /dev/null
+++ b/static/redfish/v1/schema/PowerSupplyMetrics_v1.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  PowerSupplyMetrics v1.0.0                                           -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2018-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Sensor_v1.xml">
+    <edmx:Include Namespace="Sensor"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSupplyMetrics">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="PowerSupplyMetrics" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The PowerSupplyMetrics schema contains definitions for the metrics of a power supply."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall be used to represent the metrics of a power supply unit for a Redfish implementation."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/PowerSubsystem/PowerSupplies/{PowerSupplyId}/Metrics</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+
+      <Action Name="ResetMetrics" IsBound="true">
+        <Parameter Name="PowerSupplyMetrics" Type="PowerSupplyMetrics.v1_0_0.Actions"/>
+        <Annotation Term="OData.Description" String="This action resets the summary metrics related to this equipment."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset any time intervals or counted values for this equipment."/>
+      </Action>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSupplyMetrics.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="PowerSupplyMetrics" BaseType="PowerSupplyMetrics.PowerSupplyMetrics">
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <NavigationProperty Name="InputVoltage" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The input voltage reading for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the sensor measuring the input voltage for this power supply."/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+        </NavigationProperty>
+        <NavigationProperty Name="InputCurrentAmps" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The input current reading for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the sensor measuring the input current for this power supply."/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+        </NavigationProperty>
+        <NavigationProperty Name="InputPowerWatts" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The input power reading for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the sensor measuring the input power for this power supply."/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
+        </NavigationProperty>
+        <NavigationProperty Name="EnergykWh" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="EnergykWh"/>
+          <Annotation Term="OData.Description" String="The energy consumption of this unit."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total energy, measured in kilowatt-hours (kWh), for this unit, that represents the `Total` ElectricalContext sensor when multiple energy sensors exist."/>
+        </NavigationProperty>
+        <NavigationProperty Name="FrequencyHz" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The frequency reading for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the frequency sensor for this power supply."/>
+        </NavigationProperty>
+        <NavigationProperty Name="OutputPowerWatts" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total power output reading for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the sensor measuring the total output power for this power supply."/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
+        </NavigationProperty>
+        <NavigationProperty Name="RailVoltage" Type="Collection(Sensor.Sensor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The voltage readings for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the output voltage sensors for this power supply.  The sensors shall appear in the same array order as the OutputRails property in the associated PowerSupply resource."/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+        </NavigationProperty>
+        <NavigationProperty Name="RailCurrentAmps" Type="Collection(Sensor.Sensor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The current readings for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the output current sensors for this power supply.  The sensors shall appear in the same array order as the OutputRails property in the associated PowerSupply resource."/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+        </NavigationProperty>
+        <NavigationProperty Name="RailPowerWatts" Type="Collection(Sensor.Sensor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The power readings for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the output power sensors for this power supply.  The sensors shall appear in the same array order as the OutputRails property in the associated PowerSupply resource."/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
+        </NavigationProperty>
+        <NavigationProperty Name="TemperatureCelsius" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The temperature reading for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature sensor for this power supply."/>
+        </NavigationProperty>
+        <NavigationProperty Name="FanSpeedPercent" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Fan"/>
+          <Annotation Term="OData.Description" String="The fan speed reading for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the fan speed sensor for this power supply."/>
+        </NavigationProperty>
+
+        <Property Name="Actions" Type="PowerSupplyMetrics.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="VoltageSensors">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The voltage readings for a power supply."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain properties that describe voltage sensor readings for a power supply."/>
+        <NavigationProperty Name="Input" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The power supply input."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensor that measures voltage at the input to the power supply."/>
+        </NavigationProperty>
+        <NavigationProperty Name="InputSecondary" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The power supply secondary input."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensor that measures voltage at a secondary input to the power supply.  This property shall not be present if the power supply does not include a secondary input."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output3Volt" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The 3V nominal output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensor that measures voltage on a 3 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 3V output."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output5Volt" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The 5V nominal output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensor that measures voltage on a 3 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 3V output."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output12Volt" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The 12V nominal output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensor that measures voltage on a 12 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 12V output."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output48Volt" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The 48V nominal output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensor that measures voltage on a 48 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 48V output."/>
+        </NavigationProperty>
+        <NavigationProperty Name="OutputAux" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Voltage"/>
+          <Annotation Term="OData.Description" String="The auxiliary (AUX) output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the voltage sensor that measures current on an auxiliary (AUX) output power rail.  This property shall not be present if the power supply does not include an auxiliary output."/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="CurrentSensors">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The current sensors for this power supply."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain properties that describe current sensor readings for a power supply."/>
+        <NavigationProperty Name="Input" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The power supply input."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensor that measures current at the input of the power supply."/>
+        </NavigationProperty>
+        <NavigationProperty Name="InputSecondary" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The power supply secondary input."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensor that measures current at the secondary input of the power supply.  This property shall not be present if the power supply does not include a secondary input."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output3Volt" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The 3V nominal output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensor that measures current on a 3 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 3V output."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output5Volt" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The 5V nominal output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensor that measures current on a 5 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 5V output."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output12Volt" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The 12V nominal output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensor that measures current on a 12 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 12V output."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output48Volt" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The 48V nominal output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensor that measures current on a 48 Volt nominal output power rail.  This property shall not be present if the power supply does not include a 48V output."/>
+        </NavigationProperty>
+        <NavigationProperty Name="OutputAux" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Current"/>
+          <Annotation Term="OData.Description" String="The auxiliary (AUX) output."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the current sensor that measures current on an auxiliary (AUX) output power rail.  This property shall not be present if the power supply does not include an auxiliary output."/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="PowerSensors">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The power sensors for this power supply."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain properties that describe power sensor readings for a power supply."/>
+        <NavigationProperty Name="Input" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
+          <Annotation Term="OData.Description" String="The input power reading for the power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the power, measured in Watts, for this power supply unit, as measured at the input of the power supply."/>
+        </NavigationProperty>
+        <NavigationProperty Name="InputSecondary" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
+          <Annotation Term="OData.Description" String="The secondary input power reading for the power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the power, measured in Watts, for this power supply unit, as measured at the secondary input of the power supply.  This property shall not appear if the power supply does not contain a secondary input."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Output" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Power"/>
+          <Annotation Term="OData.Description" String="The output power reading for the power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the power, measured in Watts, for this power supply unit, as measured at the output of the power supply."/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="PowerSupplyMetrics.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/PowerSupply_v1.xml b/static/redfish/v1/schema/PowerSupply_v1.xml
new file mode 100644
index 0000000..519cc67
--- /dev/null
+++ b/static/redfish/v1/schema/PowerSupply_v1.xml
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  PowerSupply v1.0.0                                                  -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml">
+    <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PhysicalContext_v1.xml">
+    <edmx:Include Namespace="PhysicalContext"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Redundancy_v1.xml">
+    <edmx:Include Namespace="Redundancy"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Assembly_v1.xml">
+    <edmx:Include Namespace="Assembly"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Circuit_v1.xml">
+    <edmx:Include Namespace="Circuit"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Outlet_v1.xml">
+    <edmx:Include Namespace="Outlet"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PowerSupplyMetrics_v1.xml">
+    <edmx:Include Namespace="PowerSupplyMetrics"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSupply">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="PowerSupply" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The PowerSupply schema describes a power supply unit."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a power supply for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="true"/>
+            <Annotation Term="OData.Description" String="Any writable properties can be updated."/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/PowerSubsystem/PowerSupplies/{PowerSupplyId}</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+
+      <Action Name="Reset" IsBound="true">
+        <Annotation Term="OData.Description" String="This action resets the power supply."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset a power supply.  A `GracefulRestart` ResetType shall reset the power supply but shall not affect the power output.  A `ForceRestart` ResetType might affect the power supply output."/>
+        <Parameter Name="Power" Type="PowerSupply.v1_0_0.Actions"/>
+        <Parameter Name="ResetType" Type="Resource.ResetType">
+          <Annotation Term="OData.Description" String="The type of reset."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the type of reset.  The service can accept a request without the parameter and shall perform a `GracefulRestart`."/>
+        </Parameter>
+      </Action>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PowerSupply.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="PowerSupply" BaseType="PowerSupply.PowerSupply">
+        <Property Name="PowerSupplyType" Type="PowerSupply.v1_0_0.PowerSupplyType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The power supply type (AC or DC)."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the input power type (AC or DC) of this power supply."/>
+        </Property>
+        <Property Name="InputNominalVoltageType" Type="Circuit.NominalVoltageType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The nominal voltage type of the line input to this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the nominal voltage type of the input line voltage in use by this power supply.  This value shall be one of the values shown in the NominalVoltageType property in the InputRanges array, if present."/>
+        </Property>
+        <Property Name="PowerCapacityWatts" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The maximum capacity of this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the maximum amount of power, in watts, that this power supply is rated to deliver."/>
+          <Annotation Term="Measures.Unit" String="W"/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+        <Property Name="Manufacturer" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The manufacturer of this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the name of the organization responsible for producing the power supply.  This organization might be the entity from whom the power supply is purchased, but this is not necessarily true."/>
+        </Property>
+        <Property Name="Model" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The model number for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the model information as defined by the manufacturer for this power supply."/>
+        </Property>
+        <Property Name="FirmwareVersion" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The firmware version for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the firmware version as defined by the manufacturer for this power supply."/>
+        </Property>
+        <Property Name="SerialNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The serial number for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the serial number as defined by the manufacturer for this power supply."/>
+        </Property>
+        <Property Name="PartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The part number for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the part number as defined by the manufacturer for this power supply."/>
+        </Property>
+        <Property Name="SparePartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The spare part number for this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the spare or replacement part number as defined by the manufacturer for this power supply."/>
+        </Property>
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <Property Name="Location" Type="Resource.Location" Nullable="false">
+          <Annotation Term="OData.Description" String="The location of the power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain location information of this power supply."/>
+        </Property>
+        <Property Name="LocationIndicatorActive" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indicator allowing an operator to physically locate this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the state of the indicator used to physically identify or locate this resource."/>
+        </Property>
+        <Property Name="InputRanges" Type="Collection(PowerSupply.v1_0_0.InputRange)" Nullable="false">
+          <Annotation Term="OData.Description" String="The input ranges that the power supply can use."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a collection of ranges usable by this power supply."/>
+        </Property>
+        <Property Name="OutputRails" Type="Collection(PowerSupply.v1_0_0.OutputRail)" Nullable="false">
+          <Annotation Term="OData.Description" String="The output power rails provided by this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of output power rails provided by this power supply.  The elements shall be ordered in ascending nominal voltage order.  This ordering is necessary for consistency with Sensor properties in an associated PowerSupplyMetrics resource."/>
+        </Property>
+        <Property Name="PhaseWiringType" Type="Circuit.PhaseWiringType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of ungrounded current-carrying conductors (phases) and the total number of conductors (wires) provided for the power supply input connector."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of ungrounded current-carrying conductors (phases) and the total number of conductors (wires) included in the input connector for the power supply."/>
+        </Property>
+        <Property Name="PlugType" Type="Circuit.PlugType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The type of plug according to NEMA, IEC, or regional standards."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the type of physical plug used for the input to this power supply, as defined by IEC, NEMA, or regional standard."/>
+        </Property>
+        <Property Name="EfficiencyRatings" Type="Collection(PowerSupply.v1_0_0.EfficiencyRating)">
+          <Annotation Term="OData.Description" String="The efficiency ratings of this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of efficiency ratings for this power supply."/>
+        </Property>
+        <Property Name="HotPluggable" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An indication of whether this device can be inserted or removed while the equipment is in operation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the device can be inserted or removed while the underlying equipment otherwise remains in its current operational state.  Devices indicated as hot-pluggable shall allow the device to become operable without altering the operational state of the underlying equipment.  Devices that cannot be inserted or removed from equipment in operation, or devices that cannot become operable without affecting the operational state of that equipment, shall be indicated as not hot-pluggable."/>
+        </Property>
+        <Property Name="Links" Type="PowerSupply.v1_0_0.Links" Nullable="false">
+          <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        </Property>
+        <NavigationProperty Name="Assembly" Type="Assembly.Assembly" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the assembly associated with this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type Assembly."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="Metrics" Type="PowerSupplyMetrics.PowerSupplyMetrics" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the power supply metrics resource associated with this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type PowerSupplyMetrics."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Actions" Type="PowerSupply.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Links" BaseType="Resource.Links">
+        <Annotation Term="OData.Description" String="The links to other resources that are related to this resource."/>
+        <Annotation Term="OData.LongDescription" String="This Redfish Specification-described type shall contain links to resources that are related to but are not contained by, or subordinate to, this resource."/>
+        <NavigationProperty Name="Outlet" Type="Outlet.Outlet" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="A link to the outlet connected to this power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type Outlet that represents the outlet connected to this power supply."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="InputRange">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="This type describes an input range for a power supply."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe an input range that the associated power supply can utilize."/>
+        <Property Name="NominalVoltageType" Type="Circuit.NominalVoltageType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The input voltage range."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the input voltage type of the associated range."/>
+        </Property>
+        <Property Name="CapacityWatts" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The maximum capacity of this power supply when operating in this input range."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the maximum amount of power, in watts, that the associated power supply is rated to deliver while operating in this input range."/>
+          <Annotation Term="Measures.Unit" String="W"/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OutputRail">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="This type describes an output power rail for a power supply."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe an output power rail provided by power supply."/>
+        <Property Name="NominalVoltage" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The nominal voltage of this output power rail."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the nominal voltage of the associated output power rail."/>
+        </Property>
+        <Property Name="PhysicalContext" Type="PhysicalContext.PhysicalContext" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The area or device to which this power rail applies."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a description of the device or region within the chassis to which this power rail applies."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="EfficiencyRating">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="This type describes an efficiency rating for a power supply."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe an efficiency rating for a power supply."/>
+        <Property Name="LoadPercent" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The electrical load for this rating."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the load, as a percentage, of this power supply at which this efficiency rating is valid."/>
+          <Annotation Term="Measures.Unit" String="%"/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+          <Annotation Term="Validation.Maximum" Int="100"/>
+        </Property>
+        <Property Name="EfficiencyPercent" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The rated efficiency of this power supply at the specified load."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the rated efficiency, as a percentage, of this power supply at the specified load."/>
+          <Annotation Term="Measures.Unit" String="%"/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+          <Annotation Term="Validation.Maximum" Int="100"/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="PowerSupplyType">
+        <Member Name="AC">
+          <Annotation Term="OData.Description" String="Alternating Current (AC) power supply."/>
+        </Member>
+        <Member Name="DC">
+          <Annotation Term="OData.Description" String="Direct Current (DC) power supply."/>
+        </Member>
+        <Member Name="ACorDC">
+          <Annotation Term="OData.Description" String="The power supply supports both DC or AC."/>
+        </Member>
+      </EnumType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="PowerSupply.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/Power_v1.xml b/static/redfish/v1/schema/Power_v1.xml
index bc9198d..884e849 100644
--- a/static/redfish/v1/schema/Power_v1.xml
+++ b/static/redfish/v1/schema/Power_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Power v1.6.1                                                        -->
+<!--# Redfish Schema:  Power v1.7.0                                                        -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -67,6 +67,15 @@
             <String>/redfish/v1/Chassis/{ChassisId}/Power</String>
           </Collection>
         </Annotation>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+              <PropertyValue Property="Version" String="v1_7_0"/>
+              <PropertyValue Property="Description" String="This schema has been deprecated in favor of the PowerSubsystem schema."/>
+            </Record>
+          </Collection>
+        </Annotation>
       </EntityType>
 
       <Action Name="PowerSupplyReset" IsBound="true">
@@ -141,8 +150,8 @@
         </Property>
         <Property Name="PowerAvailableWatts" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacity value minus the PowerAllocated value."/>
-          <Annotation Term="OData.LongDescription" String="This property shall represent the amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacity value minus the PowerAllocated value."/>
+          <Annotation Term="OData.Description" String="The amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacityWatts value minus the PowerAllocatedWatts value."/>
+          <Annotation Term="OData.LongDescription" String="This property shall represent the amount of reserve power capacity, in watts, that remains.  This value is the PowerCapacityWatts value minus the PowerAllocatedWatts value."/>
           <Annotation Term="Validation.Minimum" Int="0"/>
           <Annotation Term="Measures.Unit" String="W"/>
         </Property>
@@ -380,7 +389,7 @@
         <Property Name="FirmwareVersion" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The firmware version for this power supply."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the firwmare version as defined by the manufacturer for the associated power supply."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the firmware version as defined by the manufacturer for the associated power supply."/>
         </Property>
         <Property Name="SerialNumber" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -641,6 +650,15 @@
       <EntityType Name="Voltage" BaseType="Power.v1_0_10.Voltage"/>
       <EntityType Name="PowerSupply" BaseType="Power.v1_0_10.PowerSupply"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_0_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Power" BaseType="Power.v1_0_11.Power"/>
+      <EntityType Name="PowerControl" BaseType="Power.v1_0_11.PowerControl"/>
+      <EntityType Name="Voltage" BaseType="Power.v1_0_11.Voltage"/>
+      <EntityType Name="PowerSupply" BaseType="Power.v1_0_11.PowerSupply"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -802,6 +820,15 @@
       <EntityType Name="Voltage" BaseType="Power.v1_1_8.Voltage"/>
       <EntityType Name="PowerSupply" BaseType="Power.v1_1_8.PowerSupply"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_1_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Power" BaseType="Power.v1_1_9.Power"/>
+      <EntityType Name="PowerControl" BaseType="Power.v1_1_9.PowerControl"/>
+      <EntityType Name="Voltage" BaseType="Power.v1_1_9.Voltage"/>
+      <EntityType Name="PowerSupply" BaseType="Power.v1_1_9.PowerSupply"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -902,6 +929,15 @@
       <EntityType Name="Voltage" BaseType="Power.v1_2_8.Voltage"/>
       <EntityType Name="PowerSupply" BaseType="Power.v1_2_8.PowerSupply"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_2_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Power" BaseType="Power.v1_2_9.Power"/>
+      <EntityType Name="PowerControl" BaseType="Power.v1_2_9.PowerControl"/>
+      <EntityType Name="Voltage" BaseType="Power.v1_2_9.Voltage"/>
+      <EntityType Name="PowerSupply" BaseType="Power.v1_2_9.PowerSupply"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1062,6 +1098,15 @@
       <EntityType Name="Voltage" BaseType="Power.v1_3_6.Voltage"/>
       <EntityType Name="PowerSupply" BaseType="Power.v1_3_6.PowerSupply"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_3_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Power" BaseType="Power.v1_3_7.Power"/>
+      <EntityType Name="PowerControl" BaseType="Power.v1_3_7.PowerControl"/>
+      <EntityType Name="Voltage" BaseType="Power.v1_3_7.Voltage"/>
+      <EntityType Name="PowerSupply" BaseType="Power.v1_3_7.PowerSupply"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1135,6 +1180,15 @@
       <EntityType Name="Voltage" BaseType="Power.v1_4_5.Voltage"/>
       <EntityType Name="PowerSupply" BaseType="Power.v1_4_5.PowerSupply"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_4_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Power" BaseType="Power.v1_4_6.Power"/>
+      <EntityType Name="PowerControl" BaseType="Power.v1_4_6.PowerControl"/>
+      <EntityType Name="Voltage" BaseType="Power.v1_4_6.Voltage"/>
+      <EntityType Name="PowerSupply" BaseType="Power.v1_4_6.PowerSupply"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1231,6 +1285,15 @@
       <EntityType Name="Voltage" BaseType="Power.v1_5_4.Voltage"/>
       <EntityType Name="PowerSupply" BaseType="Power.v1_5_4.PowerSupply"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_5_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Power" BaseType="Power.v1_5_5.Power"/>
+      <EntityType Name="PowerControl" BaseType="Power.v1_5_5.PowerControl"/>
+      <EntityType Name="Voltage" BaseType="Power.v1_5_5.Voltage"/>
+      <EntityType Name="PowerSupply" BaseType="Power.v1_5_5.PowerSupply"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1254,6 +1317,29 @@
       <EntityType Name="Voltage" BaseType="Power.v1_6_0.Voltage"/>
       <EntityType Name="PowerSupply" BaseType="Power.v1_6_0.PowerSupply"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_6_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Power" BaseType="Power.v1_6_1.Power"/>
+      <EntityType Name="PowerControl" BaseType="Power.v1_6_1.PowerControl"/>
+      <EntityType Name="Voltage" BaseType="Power.v1_6_1.Voltage"/>
+      <EntityType Name="PowerSupply" BaseType="Power.v1_6_1.PowerSupply"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_7_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to deprecate the schema."/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="Power" BaseType="Power.v1_6_2.Power"/>
+
+      <EntityType Name="PowerControl" BaseType="Power.v1_6_2.PowerControl"/>
+
+      <EntityType Name="Voltage" BaseType="Power.v1_6_2.Voltage"/>
+
+      <EntityType Name="PowerSupply" BaseType="Power.v1_6_2.PowerSupply"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ProcessorMetrics_v1.xml b/static/redfish/v1/schema/ProcessorMetrics_v1.xml
index 132ba60..f562ecf 100644
--- a/static/redfish/v1/schema/ProcessorMetrics_v1.xml
+++ b/static/redfish/v1/schema/ProcessorMetrics_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ProcessorMetrics v1.1.1                                             -->
+<!--# Redfish Schema:  ProcessorMetrics v1.2.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -70,6 +70,20 @@
           </Collection>
         </Annotation>
       </EntityType>
+
+      <Action Name="ClearCurrentPeriod" IsBound="true">
+        <Annotation Term="OData.Description" String="This action sets the CurrentPeriod property's values to 0."/>
+        <Annotation Term="OData.LongDescription" String="This action shall set the CurrentPeriod property's values to 0."/>
+        <Parameter Name="ProcessorMetrics" Type="ProcessorMetrics.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_2_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ProcessorMetrics.v1_0_0">
@@ -108,14 +122,32 @@
         <Property Name="TemperatureCelsius" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The temperature of the processor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature, in Celsius, of the processor.  When this resource is subordinate to the ProcessorSummary object, this property shall be the average temperature, in Celcius, over all processors."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature, in Celsius, of the processor.  When this resource is subordinate to the ProcessorSummary object, this property shall be the average temperature, in Celsius, over all processors."/>
           <Annotation Term="Measures.Unit" String="Cel"/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_2_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of the properties in EnvironmentMetrics."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
         <Property Name="ConsumedPowerWatt" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The power, in watts, that the processor has consumed."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the power, in watts, that the processor has consumed.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of power, in watts, that all processors have consumed."/>
           <Annotation Term="Measures.Unit" String="W"/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+                <PropertyValue Property="Version" String="v1_2_0"/>
+                <PropertyValue Property="Description" String="This property has been deprecated in favor of the properties in EnvironmentMetrics."/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Property>
         <Property Name="FrequencyRatio" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -290,6 +322,12 @@
       <EntityType Name="ProcessorMetrics" BaseType="ProcessorMetrics.v1_0_2.ProcessorMetrics"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ProcessorMetrics.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="ProcessorMetrics" BaseType="ProcessorMetrics.v1_0_3.ProcessorMetrics"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ProcessorMetrics.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -311,5 +349,70 @@
       <EntityType Name="ProcessorMetrics" BaseType="ProcessorMetrics.v1_1_0.ProcessorMetrics"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ProcessorMetrics.v1_1_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="ProcessorMetrics" BaseType="ProcessorMetrics.v1_1_1.ProcessorMetrics"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ProcessorMetrics.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add CorrectableECCErrorCount and UncorrectableECCErrorCount properties for CurrentPeriod and LifeTime of the processor cache memory.  It was also was created to deprecate TemperatureCelsius and ConsumedPowerWatt in favor of Sensor properties in EnvironmentMetrics."/>
+
+      <EntityType Name="ProcessorMetrics" BaseType="ProcessorMetrics.v1_1_2.ProcessorMetrics">
+        <Property Name="CacheMetricsTotal" Type="ProcessorMetrics.v1_2_0.CacheMetricsTotal" Nullable="false">
+          <Annotation Term="OData.Description" String="The total cache metrics for this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the metrics for all of the cache memory of this processor."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="CacheMetricsTotal">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The total cache metrics for a processor."/>
+        <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the metrics for all of the cache memory for a processor."/>
+        <Property Name="CurrentPeriod" Type="ProcessorMetrics.v1_2_0.CurrentPeriod" Nullable="false">
+          <Annotation Term="OData.Description" String="The cache metrics since the last reset for this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the metrics for the current period of cache memory for this processor."/>
+        </Property>
+        <Property Name="LifeTime" Type="ProcessorMetrics.v1_2_0.LifeTime" Nullable="false">
+          <Annotation Term="OData.Description" String="The cache metrics for the lifetime of this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the metrics for the lifetime of cache memory for this processor."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="CurrentPeriod">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The cache memory metrics since the last system reset or ClearCurrentPeriod action for a processor."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe the cache memory metrics since last system reset or ClearCurrentPeriod action for a processor."/>
+        <Property Name="CorrectableECCErrorCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of the correctable errors of cache memory since reset."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of correctable errors of cache memory since reset.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of CorrectableECCErrorCount over all processors."/>
+        </Property>
+        <Property Name="UncorrectableECCErrorCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of the uncorrectable errors of cache memory since reset."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of uncorrectable errors of cache memory since reset.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of UncorrectableECCErrorCount over all processors."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="LifeTime">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The cache memory metrics for the lifetime for a processor."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe the cache memory metrics since manufacturing for a processor."/>
+        <Property Name="CorrectableECCErrorCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of the correctable errors for the lifetime of the cache memory."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of the correctable errors for the lifetime of cache memory.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of CorrectableECCErrorCount over all processors."/>
+        </Property>
+        <Property Name="UncorrectableECCErrorCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of the uncorrectable errors for the lifetime of the cache memory."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of the uncorrectable errors for the lifetime of cache memory.  When this resource is subordinate to the ProcessorSummary object, this property shall be the sum of UncorrectableECCErrorCount over all processors."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Processor_v1.xml b/static/redfish/v1/schema/Processor_v1.xml
index a0b7128..57cbc66 100644
--- a/static/redfish/v1/schema/Processor_v1.xml
+++ b/static/redfish/v1/schema/Processor_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Processor v1.10.0                                                   -->
+<!--# Redfish Schema:  Processor v1.11.0                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -61,6 +61,21 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/OperatingConfig_v1.xml">
     <edmx:Include Namespace="OperatingConfig"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics_v1.xml">
+    <edmx:Include Namespace="EnvironmentMetrics"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/MemoryMetrics_v1.xml">
+    <edmx:Include Namespace="MemoryMetrics"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Memory_v1.xml">
+    <edmx:Include Namespace="Memory"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
+    <edmx:Include Namespace="CertificateCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -414,6 +429,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_0_10.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_0_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_0_11.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -499,6 +520,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_1_6.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_1_7.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -559,6 +586,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_2_6.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_2_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_2_7.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -615,6 +648,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_3_6.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_3_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_3_7.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -763,10 +802,10 @@
           <Annotation Term="OData.Description" String="Double data rate type five synchronous graphics random-access memory."/>
         </Member>
         <Member Name="GDDR5X">
-          <Annotation Term="OData.Description" String="Double data rate type five synchronous graphics random-access memory."/>
+          <Annotation Term="OData.Description" String="Double data rate type five X synchronous graphics random-access memory."/>
         </Member>
         <Member Name="GDDR6">
-          <Annotation Term="OData.Description" String="Double data rate type five synchronous graphics random-access memory."/>
+          <Annotation Term="OData.Description" String="Double data rate type six synchronous graphics random-access memory."/>
         </Member>
         <Member Name="DDR">
           <Annotation Term="OData.Description" String="Double data rate synchronous dynamic random-access memory."/>
@@ -1034,6 +1073,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_4_5.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_4_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_4_6.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -1078,6 +1123,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_5_4.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_5_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_5_5.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -1104,6 +1155,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_6_2.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_6_3.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -1145,6 +1202,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_7_1.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_7_2.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -1176,6 +1239,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_8_0.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_8_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_8_1.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.2"/>
@@ -1230,6 +1299,12 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_9_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_9_0.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -1270,5 +1345,77 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_10_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_10_0.Processor"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_11_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Certificates, Measurements and processor memory summary and the links to the resource type Memory associated with the processor.  It was also created to add processor memory summary, the links to the resource type Memory associated with the processor, a link to EnvironmentMetrics, and SparePartNumber."/>
+
+      <EntityType Name="Processor" BaseType="Processor.v1_10_1.Processor">
+        <Property Name="MemorySummary" Type="Processor.v1_11_0.MemorySummary" Nullable="false">
+          <Annotation Term="OData.Description" String="The summary of all memory associated with this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the summary of all memory that are associated with this processor."/>
+        </Property>
+        <NavigationProperty Name="EnvironmentMetrics" Type="EnvironmentMetrics.EnvironmentMetrics" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the environment metrics for this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type EnvironmentMetrics that specifies the environment metrics for this processor."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="SparePartNumber" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The spare part number of the processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the spare part number of the processor."/>
+        </Property>
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="MemorySummary">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The summary of all memory associated with a processor."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain properties that describe the summary of all memory that are associated with a processor."/>
+        <Property Name="TotalCacheSizeMiB" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Total size of cache memory of this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total size of cache memory of this processor."/>
+          <Annotation Term="Measures.Unit" String="MiBy"/>
+        </Property>
+        <Property Name="TotalMemorySizeMiB" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Total size of volatile memory of this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total size of non-cache, volatile memory of this processor."/>
+          <Annotation Term="Measures.Unit" String="MiBy"/>
+        </Property>
+        <NavigationProperty Name="Metrics" Type="MemoryMetrics.MemoryMetrics" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the memory metrics associated with all memory of this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type MemoryMetrics that contains the metrics associated with all memory of this processor."/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="Links" BaseType="Processor.v1_4_0.Links">
+        <NavigationProperty Name="Memory" Type="Collection(Memory.Memory)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the memory associated with this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type Memory that are associated with this processor."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Protocol_v1.xml b/static/redfish/v1/schema/Protocol_v1.xml
index 5a8028c..7372bcd 100644
--- a/static/redfish/v1/schema/Protocol_v1.xml
+++ b/static/redfish/v1/schema/Protocol_v1.xml
@@ -135,7 +135,7 @@
         </Member>
         <Member Name="RoCE">
           <Annotation Term="OData.Description" String="RDMA over Converged Ethernet Protocol."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the Infiniband Architecture Specification-defined RDMA over Converged Ethernet Protocol."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the InfiniBand Architecture Specification-defined RDMA over Converged Ethernet Protocol."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -147,7 +147,7 @@
         </Member>
         <Member Name="RoCEv2">
           <Annotation Term="OData.Description" String="RDMA over Converged Ethernet Protocol Version 2."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the Infiniband Architecture Specification-defined RDMA over Converged Ethernet Protocol version 2."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the InfiniBand Architecture Specification-defined RDMA over Converged Ethernet Protocol version 2."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -171,7 +171,7 @@
         </Member>
         <Member Name="TCP">
           <Annotation Term="OData.Description" String="Transmission Control Protocol (TCP)."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the IETF-defined Tranmission Control Protocol (TCP).  For example, RFC7414 defines the roadmap of the TCP specification."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the IETF-defined Transmission Control Protocol (TCP).  For example, RFC7414 defines the roadmap of the TCP specification."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
@@ -231,7 +231,7 @@
         </Member>
         <Member Name="InfiniBand">
           <Annotation Term="OData.Description" String="InfiniBand."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the Infiniband Architecture Specification-defined InfiniBand protocol."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the InfiniBand Architecture Specification-defined InfiniBand protocol."/>
           <Annotation Term="Redfish.Revisions">
             <Collection>
               <Record>
diff --git a/static/redfish/v1/schema/RedfishExtensions_v1.xml b/static/redfish/v1/schema/RedfishExtensions_v1.xml
index d7db83d..40d83ae 100644
--- a/static/redfish/v1/schema/RedfishExtensions_v1.xml
+++ b/static/redfish/v1/schema/RedfishExtensions_v1.xml
@@ -166,7 +166,7 @@
 
       <ComplexType Name="PropertyPattern">
         <Annotation Term="OData.Description" String="The pattern by which property names must adhere."/>
-        <Annotation Term="OData.LongDescription" String="This type shall describe the pattern to which a dynamic property name must adhere."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe the pattern to which a dynamic property name adheres."/>
         <Property Name="Pattern" Type="Edm.String">
           <Annotation Term="OData.Description" String="The pattern that the property name shall match."/>
           <Annotation Term="OData.LongDescription" String="This shall contain the pattern that the property name shall match."/>
@@ -215,7 +215,7 @@
       </Term>
 
       <ComplexType Name="EnumerationMember">
-        <Annotation Term="OData.Description" String="The member of an enumeration that contains spaces, starts with a number, or otherwise does not comply with OData EnumMember naming rules.  Used for compatability purposes for enumerations that do not comply with OData rules."/>
+        <Annotation Term="OData.Description" String="The member of an enumeration that contains spaces, starts with a number, or otherwise does not comply with OData EnumMember naming rules.  Used for compatibility purposes for enumerations that do not comply with OData rules."/>
         <Annotation Term="OData.LongDescription" String="This type shall describe a member of an enumeration that contains spaces, starts with a number, or otherwise does not comply with OData EnumMember naming rules."/>
         <Property Name="Member" Type="Edm.String">
           <Annotation Term="OData.Description" String="An allowable string member."/>
diff --git a/static/redfish/v1/schema/Redundancy_v1.xml b/static/redfish/v1/schema/Redundancy_v1.xml
index 0191781..6db9c58 100644
--- a/static/redfish/v1/schema/Redundancy_v1.xml
+++ b/static/redfish/v1/schema/Redundancy_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Redundancy v1.3.4                                                   -->
+<!--# Redfish Schema:  Redundancy v1.4.0                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -31,6 +31,12 @@
         <Annotation Term="OData.Description" String="The common redundancy definition and structure used in other Redfish schemas."/>
         <Annotation Term="OData.LongDescription" String="This object represents the redundancy element property."/>
       </EntityType>
+
+      <ComplexType Name="RedundantGroup" Abstract="true">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The redundancy information for the devices in a redundancy group."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain redundancy information for the set of devices in this redundancy group."/>
+      </ComplexType>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_0_0">
@@ -165,6 +171,12 @@
       <EntityType Name="Redundancy" BaseType="Redundancy.v1_0_8.Redundancy"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Redundancy" BaseType="Redundancy.v1_0_9.Redundancy"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -220,6 +232,12 @@
       <EntityType Name="Redundancy" BaseType="Redundancy.v1_1_6.Redundancy"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Redundancy" BaseType="Redundancy.v1_1_7.Redundancy"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -278,6 +296,12 @@
       <EntityType Name="Redundancy" BaseType="Redundancy.v1_2_4.Redundancy"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Redundancy" BaseType="Redundancy.v1_2_5.Redundancy"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -316,5 +340,71 @@
       <EntityType Name="Redundancy" BaseType="Redundancy.v1_3_4.Redundancy"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_3_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Redundancy" BaseType="Redundancy.v1_3_5.Redundancy"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Redundancy.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add RedundancyGroup and RedundancyType."/>
+
+      <EntityType Name="Redundancy" BaseType="Redundancy.v1_3_6.Redundancy"/>
+
+      <ComplexType Name="RedundantGroup" BaseType="Redundancy.RedundantGroup">
+        <Property Name="RedundancyType" Type="Redundancy.v1_4_0.RedundancyType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The redundancy mode of the group."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the information about the redundancy mode of this redundancy group."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+        <Property Name="MaxSupportedInGroup" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The maximum number of devices supported in this redundancy group."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the maximum number of devices allowed in the redundancy group."/>
+        </Property>
+        <Property Name="MinNeededInGroup" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The minimum number of devices needed for this group to be redundant."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the minimum number of functional devices needed in the redundancy group for the current redundancy mode to be fault tolerant."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+        <NavigationProperty Name="RedundancyGroup" Type="Collection(Resource.Resource)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The links to the devices included in this redundancy group."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the links to the resources that represent the devices that are part of this redundancy group."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+          <Annotation Term="Redfish.Required"/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <EnumType Name="RedundancyType">
+        <Member Name="Failover">
+           <Annotation Term="OData.Description" String="Failure of one unit automatically causes a standby or offline unit in the redundancy set to take over its functions."/>
+           <Annotation Term="OData.LongDescription" String="This value shall indicate that a failure of one unit automatically causes a standby or offline unit in the redundancy set to take over its functions."/>
+        </Member>
+        <Member Name="NPlusM">
+           <Annotation Term="OData.Description" String="Multiple units are available and active such that normal operation will continue if one or more units fail."/>
+           <Annotation Term="OData.LongDescription" String="This value shall indicate that the capacity or services provided by the set of N+M devices can withstand failure of up to M units, with all units in the group normally providing capacity or service."/>
+        </Member>
+        <Member Name="Sharing">
+           <Annotation Term="OData.Description" String="Multiple units contribute or share such that operation will continue, but at a reduced capacity, if one or more units fail."/>
+        </Member>
+        <Member Name="Sparing">
+           <Annotation Term="OData.Description" String="One or more spare units are available to take over the function of a failed unit, but takeover is not automatic."/>
+        </Member>
+        <Member Name="NotRedundant">
+           <Annotation Term="OData.Description" String="The subsystem is not configured in a redundancy mode, either due to configuration or the functionality has been disabled by the user."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ResourceBlock_v1.xml b/static/redfish/v1/schema/ResourceBlock_v1.xml
index dc546fd..ca28a61 100644
--- a/static/redfish/v1/schema/ResourceBlock_v1.xml
+++ b/static/redfish/v1/schema/ResourceBlock_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ResourceBlock v1.3.3                                                -->
+<!--# Redfish Schema:  ResourceBlock v1.3.4                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -318,6 +318,12 @@
       <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_0_4.ResourceBlock"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ResourceBlock.v1_0_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_0_5.ResourceBlock"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ResourceBlock.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -380,10 +386,16 @@
       <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_1_4.ResourceBlock"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ResourceBlock.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_1_5.ResourceBlock"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ResourceBlock.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
-      <Annotation Term="OData.Description" String="This version was created to add Expansion to the ResourceBlockType enum.  It was also created to add Unavailable to the CompositionState enumeration."/>
+      <Annotation Term="OData.Description" String="This version was created to add Expansion to the ResourceBlockType enumeration.  It was also created to add Unavailable to the CompositionState enumeration."/>
 
       <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_1_1.ResourceBlock"/>
     </Schema>
@@ -412,6 +424,12 @@
       <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_2_3.ResourceBlock"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ResourceBlock.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_2_4.ResourceBlock"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ResourceBlock.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -533,5 +551,11 @@
       <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_3_2.ResourceBlock"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ResourceBlock.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="ResourceBlock" BaseType="ResourceBlock.v1_3_3.ResourceBlock"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Resource_v1.xml b/static/redfish/v1/schema/Resource_v1.xml
index 993168d..4029e3c 100644
--- a/static/redfish/v1/schema/Resource_v1.xml
+++ b/static/redfish/v1/schema/Resource_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Resource v1.10.0                                                    -->
+<!--# Redfish Schema:  Resource v1.11.0                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -20,6 +20,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LogEntry_v1.xml">
+    <edmx:Include Namespace="LogEntry"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -108,12 +111,61 @@
           <Annotation Term="OData.Description" String="The health state of this resource in the absence of its dependent resources."/>
           <Annotation Term="OData.LongDescription" String="This property shall represent the health state of the resource without considering its dependent resources.  The values shall conform to those defined in the Redfish Specification."/>
         </Property>
+        <Property Name="Conditions" Type="Collection(Resource.Condition)">
+          <Annotation Term="OData.Description" String="Conditions in this resource that require attention."/>
+          <Annotation Term="OData.LongDescription" String="This property shall represent the active conditions requiring attention in this or a related resource that affects the Health or HealthRollup of this resource."/>
+        </Property>
         <Property Name="Oem" Type="Resource.Oem" Nullable="false">
           <Annotation Term="OData.Description" String="The OEM extension property."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."/>
         </Property>
       </ComplexType>
 
+      <ComplexType Name="Condition">
+        <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="A condition that requires attention."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the description and details of a condition that exists within this resource or a related resource that requires attention."/>
+        <Property Name="Timestamp" Type="Edm.DateTimeOffset" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The time the condition occurred."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the time the condition occurred."/>
+        </Property>
+        <Property Name="MessageId" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The identifier for the message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a MessageId, as defined in the 'MessageId format' clause of the Redfish Specification."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+        <Property Name="MessageArgs" Type="Collection(Edm.String)" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of message arguments that are substituted for the arguments in the message when looked up in the message registry."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of message arguments that are substituted for the arguments in the message when looked up in the message registry.  It has the same semantics as the MessageArgs property in the Redfish MessageRegistry schema."/>
+        </Property>
+        <Property Name="Message" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The human-readable message for this condition."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a human-readable message describing this condition."/>
+        </Property>
+        <Property Name="Severity" Type="Resource.Health" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The severity of the condition."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the severity of the condition.  Services can replace the value defined in the message registry with a value more applicable to the implementation."/>
+        </Property>
+        <NavigationProperty Name="OriginOfCondition" Type="Resource.Item" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A link to the resource or object that originated the condition."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to the resource or object that originated the condition.  This property shall not be present if the condition was caused by this resource."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="LogEntry" Type="LogEntry.LogEntry" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the log entry created for this condition."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type LogEntry that represents the log entry created for this condition."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+
       <EnumType Name="State">
         <Member Name="Enabled">
           <Annotation Term="OData.Description" String="This function or resource is enabled."/>
@@ -220,11 +272,11 @@
         </Member>
         <Member Name="GracefulRestart">
           <Annotation Term="OData.Description" String="Shut down gracefully and restart the system."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate the resource will transition to a power on state, after transiting through a restart.  The transion will start after first performing tasks to safely shutdown the resource.  For example, when shutting down a computer system, the hosted operating system is allowed to safely shutting down processes and close connections.  Upon successful completion, the PowerState property, if supported, shall contain the value `On`."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the resource will transition to a power on state, after transiting through a restart.  The transition will start after first performing tasks to safely shutdown the resource.  For example, when shutting down a computer system, the hosted operating system is allowed to safely shutting down processes and close connections.  Upon successful completion, the PowerState property, if supported, shall contain the value `On`."/>
         </Member>
         <Member Name="ForceRestart">
           <Annotation Term="OData.Description" String="Shut down immediately and non-gracefully and restart the system."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate the resource will transition to a power on state, after transiting through a restart.  The transion will start immediately.  Upon successful completion, the PowerState property, if supported, shall shall contain the value `On`."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the resource will transition to a power on state, after transiting through a restart.  The transition will start immediately.  Upon successful completion, the PowerState property, if supported, shall shall contain the value `On`."/>
         </Member>
         <Member Name="Nmi">
           <Annotation Term="OData.Description" String="Generate a diagnostic interrupt, which is usually an NMI on x86 systems, to stop normal operations, complete diagnostic actions, and, typically, halt the system."/>
@@ -393,6 +445,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_0_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -560,6 +617,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_1_12">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -616,6 +678,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_2_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -900,6 +967,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_3_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -946,6 +1018,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_4_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1107,6 +1184,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_5_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1164,6 +1246,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_6_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1238,6 +1325,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_7_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1269,6 +1361,11 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_8_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -1290,11 +1387,27 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="OData.Description" String="This version was created to add long descriptions to the ResetType enumeration values."/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_9_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_10_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
-      <Annotation Term="OData.Description" String="This version was created to add the `NGUID` enumeration to Identifers."/>
+      <Annotation Term="OData.Description" String="This version was created to add the `NGUID` enumeration to Identifiers."/>
+    </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_10_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_11_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add the Conditions array property to Status."/>
     </Schema>
 
   </edmx:DataServices>
diff --git a/static/redfish/v1/schema/Role_v1.xml b/static/redfish/v1/schema/Role_v1.xml
index 540742f..5fabf01 100644
--- a/static/redfish/v1/schema/Role_v1.xml
+++ b/static/redfish/v1/schema/Role_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Role v1.2.5                                                         -->
+<!--# Redfish Schema:  Role v1.3.0                                                         -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -67,8 +67,8 @@
       <EntityType Name="Role" BaseType="Role.Role">
         <Property Name="IsPredefined" Type="Edm.Boolean" Nullable="false" DefaultValue="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="An indication of whether the role is a Redfish-predefined role rather than a custom Redfish role."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the role is a Redfish-predefined role rather than a custom Redfish role."/>
+          <Annotation Term="OData.Description" String="An indication of whether the role is predefined by Redfish or an OEM rather than a client-defined role."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether the role is predefined by Redfish or an OEM as contrasted with a client-defined role."/>
         </Property>
         <Property Name="AssignedPrivileges" Type="Collection(Privileges.PrivilegeType)" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -81,7 +81,6 @@
           <Annotation Term="OData.LongDescription" String="This property shall contain the OEM privileges for this role.  For predefined roles, this property shall be read-only.  For custom roles, some implementations might prevent writing to this property."/>
         </Property>
       </EntityType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_0_2">
@@ -222,5 +221,23 @@
       <EntityType Name="Role" BaseType="Role.v1_2_4.Role"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Role.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="Role" BaseType="Role.v1_2_5.Role">
+        <Property Name="Restricted" Type="Edm.Boolean" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An indication of whether use of the role is restricted."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate whether use of the role is restricted by a service as defined by the 'Restricted roles and restricted privileges' clause of the Redfish Specification.  If this property is not present, the value shall be assumed to be `false`."/>
+        </Property>
+        <Property Name="AlternateRoleId" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An equivalent role to use when this role is restricted."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a non-restricted `RoleId` intended to be used in its place when the Restricted property contains the value `true`."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/RouteEntryCollection_v1.xml b/static/redfish/v1/schema/RouteEntryCollection_v1.xml
index cefd398..ca7e861 100644
--- a/static/redfish/v1/schema/RouteEntryCollection_v1.xml
+++ b/static/redfish/v1/schema/RouteEntryCollection_v1.xml
@@ -52,8 +52,8 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
-            <String>/redfish/v1/Fabrics/{FrabricId}/Switches/{SwitchId}/Ports/{PortId}/LPRT</String>
-            <String>/redfish/v1/Fabrics/{FrabricId}/Switches/{SwitchId}/Ports/{PortId}/MPRT</String>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Ports/{PortId}/LPRT</String>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Ports/{PortId}/MPRT</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/MSDT</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/SSDT</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/LPRT</String>
diff --git a/static/redfish/v1/schema/RouteEntry_v1.xml b/static/redfish/v1/schema/RouteEntry_v1.xml
index ad91d6a..819bb08 100644
--- a/static/redfish/v1/schema/RouteEntry_v1.xml
+++ b/static/redfish/v1/schema/RouteEntry_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  RouteEntry v1.0.0                                                   -->
+<!--# Redfish Schema:  RouteEntry v1.0.1                                                   -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -114,5 +114,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="RouteEntry.v1_0_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="RouteEntry" BaseType="RouteEntry.v1_0_0.RouteEntry"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/RouteSetEntryCollection_v1.xml b/static/redfish/v1/schema/RouteSetEntryCollection_v1.xml
index 054c66e..43fbe51 100644
--- a/static/redfish/v1/schema/RouteSetEntryCollection_v1.xml
+++ b/static/redfish/v1/schema/RouteSetEntryCollection_v1.xml
@@ -52,8 +52,8 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
-            <String>/redfish/v1/Fabrics/{FrabricId}/Switches/{SwitchId}/Ports/{PortId}/LPRT/{LPRTId}/RouteSet</String>
-            <String>/redfish/v1/Fabrics/{FrabricId}/Switches/{SwitchId}/Ports/{PortId}/MPRT/{MPRTId}/RouteSet</String>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Ports/{PortId}/LPRT/{LPRTId}/RouteSet</String>
+            <String>/redfish/v1/Fabrics/{FabricId}/Switches/{SwitchId}/Ports/{PortId}/MPRT/{MPRTId}/RouteSet</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/MSDT/{MSDTId}/RouteSet</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/SSDT/{SSDTId}/RouteSet</String>
             <String>/redfish/v1/Systems/{ComputerSystemId}/FabricAdapters/{FabricAdapterId}/Ports/{PortId}/LPRT/{LPRTId}/RouteSet</String>
diff --git a/static/redfish/v1/schema/RouteSetEntry_v1.xml b/static/redfish/v1/schema/RouteSetEntry_v1.xml
index 72836e3..9810ef8 100644
--- a/static/redfish/v1/schema/RouteSetEntry_v1.xml
+++ b/static/redfish/v1/schema/RouteSetEntry_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  RouteSetEntry v1.0.0                                                -->
+<!--# Redfish Schema:  RouteSetEntry v1.0.1                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -113,5 +113,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="RouteSetEntry.v1_0_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="RouteSetEntry" BaseType="RouteSetEntry.v1_0_0.RouteSetEntry"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Schedule_v1.xml b/static/redfish/v1/schema/Schedule_v1.xml
index ed48768..8f037ef 100644
--- a/static/redfish/v1/schema/Schedule_v1.xml
+++ b/static/redfish/v1/schema/Schedule_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Schedule v1.2.1                                                     -->
+<!--# Redfish Schema:  Schedule v1.2.2                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -173,7 +173,7 @@
         <Property Name="EnabledIntervals" Type="Collection(Edm.String)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="Intervals when scheduled occurrences are enabled."/>
-          <Annotation Term="OData.LongDescription" String="Each value shall be an ISO 8601 conformant interval specifying when occurences are enabled."/>
+          <Annotation Term="OData.LongDescription" String="Each value shall be an ISO 8601 conformant interval specifying when occurrences are enabled."/>
         </Property>
       </ComplexType>
     </Schema>
@@ -183,11 +183,17 @@
       <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
       <ComplexType Name="Schedule" BaseType="Schedule.v1_1_0.Schedule"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Schedule.v1_1_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <ComplexType Name="Schedule" BaseType="Schedule.v1_1_1.Schedule"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Schedule.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
-      <Annotation Term="OData.Description" String="This version was created to correcttime and date properties to use DateTimeOffset and Duration formats, add 'Every' enumerations to DayOfWeek and MonthOfYear types, and to incorporate default behavior into descriptions."/>
+      <Annotation Term="OData.Description" String="This version was created to correct time and date properties to use DateTimeOffset and Duration formats, add 'Every' enumerations to DayOfWeek and MonthOfYear types, and to incorporate default behavior into descriptions."/>
       <ComplexType Name="Schedule" BaseType="Schedule.v1_1_0.Schedule"/>
     </Schema>
 
@@ -196,6 +202,12 @@
       <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
       <ComplexType Name="Schedule" BaseType="Schedule.v1_2_0.Schedule"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Schedule.v1_2_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/>
+      <ComplexType Name="Schedule" BaseType="Schedule.v1_2_1.Schedule"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Sensor_v1.xml b/static/redfish/v1/schema/Sensor_v1.xml
index bdba6c9..c6f371d 100644
--- a/static/redfish/v1/schema/Sensor_v1.xml
+++ b/static/redfish/v1/schema/Sensor_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Sensor v1.1.1                                                       -->
+<!--# Redfish Schema:  Sensor v1.2.0                                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -121,7 +121,7 @@
         </Member>
         <Member Name="Line1ToNeutral">
           <Annotation Term="OData.Description" String="The circuit formed by L1 and neutral current-carrying conductors."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent a circuit formed by L1 and neutral current-carrying conductors, such as circuits with phase wiring types of Single-pase / 3-Wire, Two-phase / 3-Wire or 4-Wire, or Three-phase / 4-Wire or 5-Wire."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent a circuit formed by L1 and neutral current-carrying conductors, such as circuits with phase wiring types of Single-phase / 3-Wire, Two-phase / 3-Wire or 4-Wire, or Three-phase / 4-Wire or 5-Wire."/>
         </Member>
         <Member Name="Line2ToNeutral">
           <Annotation Term="OData.Description" String="The circuit formed by L2 and neutral current-carrying conductors."/>
@@ -192,18 +192,18 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The area or device to which this sensor measurement applies."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies."/>
-          <Annotation Term="Redfish.Excerpt" String="Array"/>
+          <Annotation Term="Redfish.Excerpt" String="Array,FanArray,PowerArray"/>
         </Property>
         <Property Name="PhysicalSubContext" Type="PhysicalContext.PhysicalSubContext">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The usage or location within a device to which this sensor measurement applies."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance."/>
-          <Annotation Term="Redfish.Excerpt" String="Array"/>
+          <Annotation Term="Redfish.Excerpt" String="Array,FanArray,PowerArray"/>
         </Property>
         <Property Name="PeakReading" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The peak sensor value."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the peak sensor value since the last ResetStatistics action was performed or the service last reset the time-based property values."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the peak sensor value since the last ResetMetrics action was performed or the service last reset the time-based property values."/>
         </Property>
 
         <Property Name="MaxAllowableOperatingValue" Type="Edm.Decimal">
@@ -232,14 +232,14 @@
           <Annotation Term="OData.Description" String="The product of voltage and current for an AC circuit, in Volt-Ampere units."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/>
           <Annotation Term="Measures.Unit" String="V.A"/>
-          <Annotation Term="Redfish.Excerpt" String="Power"/>
+          <Annotation Term="Redfish.Excerpt" String="Power,PowerArray"/>
         </Property>
         <Property Name="ReactiveVAR" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/>
           <Annotation Term="Measures.Unit" String="V.A"/>
-          <Annotation Term="Redfish.Excerpt" String="Power"/>
+          <Annotation Term="Redfish.Excerpt" String="Power,PowerArray"/>
         </Property>
         <Property Name="PowerFactor" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -247,7 +247,7 @@
           <Annotation Term="OData.LongDescription" String="This property shall identify the quotient of PowerRealWatts and PowerApparentVA for a circuit.  PowerFactor is expressed in unit-less 1/100ths.  This property can appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/>
           <Annotation Term="Validation.Minimum" Int="0"/>
           <Annotation Term="Validation.Maximum" Int="1"/>
-          <Annotation Term="Redfish.Excerpt" String="Power"/>
+          <Annotation Term="Redfish.Excerpt" String="Power,PowerArray"/>
         </Property>
         <Property Name="LoadPercent" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -328,7 +328,7 @@
         <Property Name="SensorResetTime" Type="Edm.DateTimeOffset">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The date and time when the time-based properties were last reset."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time when the ResetStatistics action was last performed or the service last reset the time-based property values."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time when the ResetMetrics action was last performed or the service last reset the time-based property values."/>
           <Annotation Term="Redfish.Excerpt" String="EnergykWh"/>
         </Property>
 
@@ -385,7 +385,7 @@
         <Property Name="DwellTime" Type="Edm.Duration">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The duration the sensor value must violate the threshold before the threshold is activated."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the duration the sensor value must violate the threshold before the threshold is activated."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the duration the sensor value violates the threshold before the threshold is activated."/>
         </Property>
       </ComplexType>
 
@@ -526,6 +526,12 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_0_4.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_0_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_0_5.Sensor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -547,7 +553,7 @@
         <Property Name="LifetimeReading" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The total accumulation value for this sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the total accumulation of the Reading property over the sensor's life time.  This value shall not be reset by the ResetStatistics action."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total accumulation of the Reading property over the sensor's life time.  This value shall not be reset by the ResetMetrics action."/>
           <Annotation Term="Redfish.Excerpt" String="EnergykWh"/>
         </Property>
         <Property Name="SensingInterval" Type="Edm.Duration">
@@ -558,7 +564,7 @@
         <Property Name="ReadingTime" Type="Edm.DateTimeOffset">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The date and time that the reading was acquired from the sensor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the date and timetime that the reading data was acquired from the sensor.  This value is used to synchronize readings from multiple sensors, and does not represent the time at which the resource was accessed."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the date and time that the reading data was acquired from the sensor.  This value is used to synchronize readings from multiple sensors, and does not represent the time at which the resource was accessed."/>
         </Property>
         <Property Name="Implementation" Type="Sensor.v1_1_0.ImplementationType">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -586,5 +592,59 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_1_0.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_1_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_1_1.Sensor"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add SpeedRPM and DeviceName properties.  It was also created to add several ReadingType values."/>
+
+      <EntityType Name="Sensor" BaseType="Sensor.v1_1_1.Sensor">
+        <NavigationProperty Name="RelatedItem" Type="Collection(Resource.Item)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to resources or objects that this sensor services."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources or objects that this sensor services."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="SpeedRPM" Type="Edm.Decimal">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The rotational speed."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a reading of the rotational speed of the device in revolutions per minute (RPM) units."/>
+          <Annotation Term="Measures.Unit" String="RPM"/>
+          <Annotation Term="Redfish.Excerpt" String="Fan,FanArray"/>
+        </Property>
+        <Property Name="DeviceName" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The name of the device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the name of the device associated with this sensor.  If the device is represented by a resource, the value shall contain the value of the Name property of the associated resource."/>
+          <Annotation Term="Redfish.Excerpt" String="Array,FanArray"/>
+          <Annotation Term="Redfish.ExcerptCopyOnly"/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Thresholds" BaseType="Sensor.v1_0_0.Thresholds">
+        <Property Name="UpperCautionUser" Type="Sensor.v1_0_0.Threshold" Nullable="false">
+          <Annotation Term="OData.Description" String="The value at which the reading is above normal range."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value at which the Reading property is above the normal range.  The value of the property shall use the same units as the Reading property."/>
+        </Property>
+        <Property Name="UpperCriticalUser" Type="Sensor.v1_0_0.Threshold" Nullable="false">
+          <Annotation Term="OData.Description" String="The value at which the reading is above normal range but not yet fatal."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value at which the Reading property is above the normal range but is not yet fatal.  The value of the property shall use the same units as the Reading property."/>
+        </Property>
+        <Property Name="LowerCautionUser" Type="Sensor.v1_0_0.Threshold" Nullable="false">
+          <Annotation Term="OData.Description" String="The value at which the reading is below normal range."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value at which the Reading property is below normal range.  The value of the property shall use the same units as the Reading property."/>
+        </Property>
+        <Property Name="LowerCriticalUser" Type="Sensor.v1_0_0.Threshold" Nullable="false">
+          <Annotation Term="OData.Description" String="The value at which the reading is below normal range but not yet fatal."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value at which the Reading property is below the normal range but is not yet fatal.  The value of the property shall use the same units as the Reading property."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/SerialInterface_v1.xml b/static/redfish/v1/schema/SerialInterface_v1.xml
index f8aac45..f710d8b 100644
--- a/static/redfish/v1/schema/SerialInterface_v1.xml
+++ b/static/redfish/v1/schema/SerialInterface_v1.xml
@@ -298,7 +298,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_0_4">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to correct the ConnectorType enumerated values to match orginal publication."/>
+      <Annotation Term="OData.Description" String="This version was created to correct the ConnectorType enumerated values to match original publication."/>
       <EntityType Name="SerialInterface" BaseType="SerialInterface.v1_0_3.SerialInterface"/>
     </Schema>
 
@@ -368,7 +368,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SerialInterface.v1_1_1">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to correct the ConnectorType enumerated values to match orginal publication."/>
+      <Annotation Term="OData.Description" String="This version was created to correct the ConnectorType enumerated values to match original publication."/>
       <EntityType Name="SerialInterface" BaseType="SerialInterface.v1_1_0.SerialInterface"/>
     </Schema>
 
diff --git a/static/redfish/v1/schema/SessionService_v1.xml b/static/redfish/v1/schema/SessionService_v1.xml
index a5b9f5c..69a1f31 100644
--- a/static/redfish/v1/schema/SessionService_v1.xml
+++ b/static/redfish/v1/schema/SessionService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  SessionService v1.1.7                                               -->
+<!--# Redfish Schema:  SessionService v1.1.8                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -109,7 +109,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SessionService.v1_0_4">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated.  In this case, ServiceEnabled descrtiption was updated."/>
+      <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated.  In this case, ServiceEnabled description was updated."/>
       <EntityType Name="SessionService" BaseType="SessionService.v1_0_3.SessionService"/>
     </Schema>
 
@@ -137,6 +137,12 @@
       <EntityType Name="SessionService" BaseType="SessionService.v1_0_7.SessionService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SessionService.v1_0_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="SessionService" BaseType="SessionService.v1_0_8.SessionService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SessionService.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -179,7 +185,7 @@
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SessionService.v1_1_3">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-      <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated.  In this case, ServiceEnabled descrtiption was updated."/>
+      <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated.  In this case, ServiceEnabled description was updated."/>
       <EntityType Name="SessionService" BaseType="SessionService.v1_1_2.SessionService"/>
     </Schema>
 
@@ -207,5 +213,11 @@
       <EntityType Name="SessionService" BaseType="SessionService.v1_1_6.SessionService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SessionService.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="SessionService" BaseType="SessionService.v1_1_7.SessionService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Settings_v1.xml b/static/redfish/v1/schema/Settings_v1.xml
index dc61b1f..bc93c78 100644
--- a/static/redfish/v1/schema/Settings_v1.xml
+++ b/static/redfish/v1/schema/Settings_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Settings v1.3.1                                                     -->
+<!--# Redfish Schema:  Settings v1.3.3                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -193,7 +193,7 @@
           <Annotation Term="OData.LongDescription" String="This value shall indicate the values within the settings resource are applied during the maintenance window specified by the MaintenanceWindowStartTime and MaintenanceWindowDurationInSeconds properties.  A service can perform resets during this maintenance window."/>
         </Member>
         <Member Name="InMaintenanceWindowOnReset">
-          <Annotation Term="OData.Description" String="Apply after a reset but within maintenance window as specified by an adminstrator."/>
+          <Annotation Term="OData.Description" String="Apply after a reset but within maintenance window as specified by an administrator."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate the values within the settings resource are applied during the maintenance window specified by the MaintenanceWindowStartTime and MaintenanceWindowDurationInSeconds properties, and if a reset occurs within the maintenance window."/>
         </Member>
       </EnumType>
@@ -226,6 +226,13 @@
       <ComplexType Name="Settings" BaseType="Settings.v1_1_3.Settings"/>
       <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_1_3.PreferredApplyTime"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <ComplexType Name="Settings" BaseType="Settings.v1_1_4.Settings"/>
+      <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_1_4.PreferredApplyTime"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -324,6 +331,15 @@
       <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_2_3.OperationApplyTimeSupport"/>
       <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_2_3.MaintenanceWindow"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <ComplexType Name="Settings" BaseType="Settings.v1_2_4.Settings"/>
+      <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_2_4.PreferredApplyTime"/>
+      <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_2_4.OperationApplyTimeSupport"/>
+      <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_2_4.MaintenanceWindow"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -353,6 +369,15 @@
       <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_3_1.OperationApplyTimeSupport"/>
       <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_3_1.MaintenanceWindow"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_3_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <ComplexType Name="Settings" BaseType="Settings.v1_3_2.Settings"/>
+      <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_3_2.PreferredApplyTime"/>
+      <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_3_2.OperationApplyTimeSupport"/>
+      <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_3_2.MaintenanceWindow"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Signature_v1.xml b/static/redfish/v1/schema/Signature_v1.xml
index b181ddf..c76d897 100644
--- a/static/redfish/v1/schema/Signature_v1.xml
+++ b/static/redfish/v1/schema/Signature_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Signature v1.0.1                                                    -->
+<!--# Redfish Schema:  Signature v1.0.2                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -79,13 +79,13 @@
         <Property Name="SignatureType" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The format of the signature."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the format type for the signature.  The format is qualified by the value of the SignatureTypeRegisty property."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the format type for the signature.  The format is qualified by the value of the SignatureTypeRegistry property."/>
           <Annotation Term="Redfish.RequiredOnCreate"/>
         </Property>
         <Property Name="SignatureString" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The string for the signature."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the string of the signature, and the format shall follow the requirements specified by the value of the SignatureType property.  If the signature contains any private keys, they shall be removed from the string in reponses.  If the private key for the signature is not known by the service and is needed to use the signature, the client shall provide the private key as part of the string in the POST request."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the string of the signature, and the format shall follow the requirements specified by the value of the SignatureType property.  If the signature contains any private keys, they shall be removed from the string in responses.  If the private key for the signature is not known by the service and is needed to use the signature, the client shall provide the private key as part of the string in the POST request."/>
           <Annotation Term="Redfish.RequiredOnCreate"/>
         </Property>
         <Property Name="UefiSignatureOwner" Type="Edm.Guid">
@@ -121,6 +121,12 @@
       <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
       <EntityType Name="Signature" BaseType="Signature.v1_0_0.Signature"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Signature.v1_0_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Signature" BaseType="Signature.v1_0_1.Signature"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/SimpleStorage_v1.xml b/static/redfish/v1/schema/SimpleStorage_v1.xml
index 56f477c..6748bf0 100644
--- a/static/redfish/v1/schema/SimpleStorage_v1.xml
+++ b/static/redfish/v1/schema/SimpleStorage_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  SimpleStorage v1.3.0                                                -->
+<!--# Redfish Schema:  SimpleStorage v1.3.1                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -68,7 +68,6 @@
           </Collection>
         </Annotation>
       </EntityType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_0_0">
@@ -120,7 +119,6 @@
           <Annotation Term="OData.LongDescription" String="This property shall indicate the model information as provided by the manufacturer of this storage device."/>
         </Property>
       </ComplexType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_0_2">
@@ -159,9 +157,16 @@
       <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_0_6.SimpleStorage"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_0_7.SimpleStorage"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.1"/>
+
       <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_0_2.SimpleStorage"/>
 
       <ComplexType Name="Device" BaseType="SimpleStorage.v1_0_0.Device">
@@ -173,7 +178,6 @@
           <Annotation Term="Measures.Unit" String="By"/>
         </Property>
       </ComplexType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_1_1">
@@ -206,9 +210,16 @@
       <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_1_4.SimpleStorage"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_1_5.SimpleStorage"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
+
       <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_1_2.SimpleStorage">
         <Property Name="Links" Type="SimpleStorage.v1_2_0.Links" Nullable="false">
           <Annotation Term="OData.Description" String="The links to other Resources that are related to this Resource."/>
@@ -266,10 +277,18 @@
       <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_2_2.SimpleStorage"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_2_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_2_3.SimpleStorage"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
+
       <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_2_3.SimpleStorage"/>
+
       <ComplexType Name="Links" BaseType="SimpleStorage.v1_2_0.Links">
         <NavigationProperty Name="Storage" Type="Storage.Storage" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -280,5 +299,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SimpleStorage.v1_3_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="SimpleStorage" BaseType="SimpleStorage.v1_3_0.SimpleStorage"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/SoftwareInventory_v1.xml b/static/redfish/v1/schema/SoftwareInventory_v1.xml
index 74cd6f0..a9adf88 100644
--- a/static/redfish/v1/schema/SoftwareInventory_v1.xml
+++ b/static/redfish/v1/schema/SoftwareInventory_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  SoftwareInventory v1.3.0                                            -->
+<!--# Redfish Schema:  SoftwareInventory v1.4.0                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -23,6 +23,7 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
   </edmx:Reference>
 
   <edmx:DataServices>
@@ -56,6 +57,11 @@
         </Annotation>
       </EntityType>
 
+      <ComplexType Name="MeasurementBlock" Abstract="true">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The DSP0274-defined measurement block information."/>
+        <Annotation Term="OData.LongDescription" String="This type shall describe a DSP0274-defined measurement block."/>
+      </ComplexType>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SoftwareInventory.v1_0_0">
@@ -233,5 +239,37 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="SoftwareInventory.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Measurement property in support of DSP0274."/>
+
+      <EntityType Name="SoftwareInventory" BaseType="SoftwareInventory.v1_3_0.SoftwareInventory">
+        <Property Name="Measurement" Type="SoftwareInventory.MeasurementBlock" Nullable="false">
+          <Annotation Term="OData.Description" String="A DSP0274-defined measurement block."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a DSP0274-defined measurement block."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="MeasurementBlock" BaseType="SoftwareInventory.MeasurementBlock">
+        <Property Name="MeasurementSpecification" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The DSP0274-defined MeasurementSpecification field of the measurement block."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value of DSP0274-defined MeasurementSpecification field of the measurement block."/>
+        </Property>
+        <Property Name="MeasurementSize" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The DSP0274-defined MeasurementSize field of the measurement block."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value of DSP0274-defined MeasurementSize field of the measurement block."/>
+        </Property>
+        <Property Name="Measurement" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The hexadecimal string representation of the numeric value of the DSP0274-defined Measurement field  of the measurement block."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the value of the hexadecimal string representation of the numeric value of the DSP0274-defined Measurement field  of the measurement block."/>
+          <Annotation Term="Validation.Pattern" String="^[0-9a-fA-F]+$"/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/StorageController_v1.xml b/static/redfish/v1/schema/StorageController_v1.xml
index c889372..3135b72 100644
--- a/static/redfish/v1/schema/StorageController_v1.xml
+++ b/static/redfish/v1/schema/StorageController_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  StorageController v1.0.0                                            -->
+<!--# Redfish Schema:  StorageController v1.1.0                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -49,6 +49,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/Volume_v1.xml">
     <edmx:Include Namespace="Volume"/>
   </edmx:Reference>
+    <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
+    <edmx:Include Namespace="CertificateCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -105,7 +111,7 @@
         <Property Name="FirmwareVersion" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The firmware version of this storage controller."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the firwmare version as defined by the manufacturer for the associated storage controller."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the firmware version as defined by the manufacturer for the associated storage controller."/>
         </Property>
         <Property Name="Manufacturer" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -251,7 +257,7 @@
         <Property Name="PersistentCacheSizeMiB" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The portion of the cache memory that is persistent, measured in MiB."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the amount of cache memory that is persistent as measured in mebibytes.  This size shall be less than or equal to the TotalCacheSizeMib."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the amount of cache memory that is persistent as measured in mebibytes.  This size shall be less than or equal to the TotalCacheSizeMiB."/>
           <Annotation Term="Validation.Minimum" Int="0"/>
           <Annotation Term="Measures.Unit" String="MiBy"/>
         </Property>
@@ -443,7 +449,7 @@
         <Member Name="NonOptimized">
           <Annotation Term="OData.Description" String="Commands processed by a controller that reports this state for an ANA Group provide non-optimized access characteristics, such as lower performance or non-optimal use of subsystem resources, to any namespace in the ANA Group."/>
         </Member>
-        <Member Name="Inacessible">
+        <Member Name="Inaccessible">
           <Annotation Term="OData.Description" String="Namespaces in this group are inaccessible.  Commands are not able to access user data of namespaces in the ANA Group."/>
         </Member>
         <Member Name="PersistentLoss">
@@ -452,5 +458,30 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageController.v1_0_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors.  It was also created to correct the spelling of the enumeration value `Inaccessible`."/>
+      <EntityType Name="StorageController" BaseType="StorageController.v1_0_0.StorageController"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageController.v1_1_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Certificates and Measurements to devices for attestation and identity management."/>
+
+      <EntityType Name="StorageController" BaseType="StorageController.v1_0_1.StorageController">
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Storage_v1.xml b/static/redfish/v1/schema/Storage_v1.xml
index 110a7da..c87a322 100644
--- a/static/redfish/v1/schema/Storage_v1.xml
+++ b/static/redfish/v1/schema/Storage_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################                   -->
-<!--# Redfish Schema:  Storage v1.9.0                                                                  -->
+<!--# Redfish Schema:  Storage v1.10.0                                                                 -->
 <!--#                                                                                                  -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,                  -->
 <!--# available at http://www.dmtf.org/standards/redfish                                               -->
@@ -85,6 +85,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/StorageControllerCollection_v1.xml">
     <edmx:Include Namespace="StorageControllerCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
+    <edmx:Include Namespace="CertificateCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -222,7 +228,7 @@
         <Property Name="FirmwareVersion" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The firmware version of this storage controller."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the firwmare version as defined by the manufacturer for the associated storage controller."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the firmware version as defined by the manufacturer for the associated storage controller."/>
         </Property>
         <Property Name="Manufacturer" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -334,6 +340,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_0_8.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_0_9.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_0_9.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -414,6 +427,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_1_7.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_1_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_1_8.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_1_8.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -486,6 +506,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_2_5.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_2_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_2_6.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_2_6.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.2"/>
@@ -543,6 +570,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_3_5.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_3_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_3_6.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_3_6.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -615,6 +649,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_4_4.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_4_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_4_5.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_4_5.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -647,7 +688,7 @@
         <Property Name="PersistentCacheSizeMiB" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The portion of the cache memory that is persistent, measured in MiB."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the amount of cache memory that is persistent as measured in mebibytes.  This size shall be less than or equal to the TotalCacheSizeMib."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the amount of cache memory that is persistent as measured in mebibytes.  This size shall be less than or equal to the TotalCacheSizeMiB."/>
           <Annotation Term="Validation.Minimum" Int="0"/>
           <Annotation Term="Measures.Unit" String="MiBy"/>
         </Property>
@@ -686,6 +727,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_5_3.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_5_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_5_4.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_5_4.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -722,6 +770,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_6_2.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_6_3.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_6_3.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -790,6 +845,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_7_1.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_7_2.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_7_2.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -837,6 +899,13 @@
       <EntityType Name="StorageController" BaseType="Storage.v1_8_0.StorageController"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_8_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_8_1.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_8_1.StorageController"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_9_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -870,5 +939,33 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_9_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Storage" BaseType="Storage.v1_9_0.Storage"/>
+      <EntityType Name="StorageController" BaseType="Storage.v1_8_2.StorageController"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_10_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add Certificates and Measurements to devices for attestation and identity management."/>
+
+      <EntityType Name="Storage" BaseType="Storage.v1_9_1.Storage"/>
+
+      <EntityType Name="StorageController" BaseType="Storage.v1_9_1.StorageController">
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Switch_v1.xml b/static/redfish/v1/schema/Switch_v1.xml
index 2d90601..897392c 100644
--- a/static/redfish/v1/schema/Switch_v1.xml
+++ b/static/redfish/v1/schema/Switch_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Switch v1.4.0                                                       -->
+<!--# Redfish Schema:  Switch v1.5.0                                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -51,6 +51,12 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PCIeDevice_v1.xml">
     <edmx:Include Namespace="PCIeDevice"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/CertificateCollection_v1.xml">
+    <edmx:Include Namespace="CertificateCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/SoftwareInventory_v1.xml">
+    <edmx:Include Namespace="SoftwareInventory"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -275,6 +281,12 @@
       <EntityType Name="Switch" BaseType="Switch.v1_0_6.Switch"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_0_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Switch" BaseType="Switch.v1_0_7.Switch"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -311,6 +323,12 @@
       <EntityType Name="Switch" BaseType="Switch.v1_1_3.Switch"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="Switch" BaseType="Switch.v1_1_4.Switch"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -319,7 +337,7 @@
         <Property Name="FirmwareVersion" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The firmware version of this switch."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the firwmare version as defined by the manufacturer for the associated switch."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the firmware version as defined by the manufacturer for the associated switch."/>
         </Property>
       </EntityType>
     </Schema>
@@ -330,6 +348,12 @@
       <EntityType Name="Switch" BaseType="Switch.v1_2_0.Switch"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_2_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Switch" BaseType="Switch.v1_2_1.Switch"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -363,6 +387,12 @@
       <EntityType Name="Switch" BaseType="Switch.v1_3_0.Switch"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_3_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Switch" BaseType="Switch.v1_3_1.Switch"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -398,5 +428,30 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_4_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Switch" BaseType="Switch.v1_4_0.Switch"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Switch.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add Certificates and Measurements to devices for attestation and identity management."/>
+
+      <EntityType Name="Switch" BaseType="Switch.v1_4_1.Switch">
+        <NavigationProperty Name="Certificates" Type="CertificateCollection.CertificateCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to a collection of certificates for device identity and attestation."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type CertificateCollection that contains certificates for device identity and attestation."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Measurements" Type="Collection(SoftwareInventory.MeasurementBlock)" Nullable="false">
+          <Annotation Term="OData.Description" String="An array of DSP0274-defined measurement blocks."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of DSP0274-defined measurement blocks."/>
+        </Property>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/TaskService_v1.xml b/static/redfish/v1/schema/TaskService_v1.xml
index b96dcc7..c0be43f 100644
--- a/static/redfish/v1/schema/TaskService_v1.xml
+++ b/static/redfish/v1/schema/TaskService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  TaskService v1.1.5                                                  -->
+<!--# Redfish Schema:  TaskService v1.1.6                                                  -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -67,8 +67,8 @@
       <EntityType Name="TaskService" BaseType="TaskService.TaskService">
         <Property Name="CompletedTaskOverWritePolicy" Type="TaskService.v1_0_0.OverWritePolicy" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The overwrite policy for completed tasks.  This property indicates whether the task service overwrites completed task information."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate how the task service shall handle completed tasks if the service must track more tasks.  This property indicates whether the task service overwrites completed task information."/>
+          <Annotation Term="OData.Description" String="The overwrite policy for completed tasks.  This property indicates if the task service overwrites completed task information."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the overwrite policy for completed tasks.  This property shall indicate if the task service overwrites completed task information."/>
         </Property>
         <Property Name="DateTime" Type="Edm.DateTimeOffset">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -149,6 +149,12 @@
       <EntityType Name="TaskService" BaseType="TaskService.v1_0_7.TaskService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TaskService.v1_0_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="TaskService" BaseType="TaskService.v1_0_8.TaskService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TaskService.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -207,5 +213,11 @@
       <EntityType Name="TaskService" BaseType="TaskService.v1_1_4.TaskService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TaskService.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="TaskService" BaseType="TaskService.v1_1_5.TaskService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Task_v1.xml b/static/redfish/v1/schema/Task_v1.xml
index 4ceaf48..dd8bb99 100644
--- a/static/redfish/v1/schema/Task_v1.xml
+++ b/static/redfish/v1/schema/Task_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Task v1.5.0                                                         -->
+<!--# Redfish Schema:  Task v1.5.1                                                         -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -130,7 +130,7 @@
         </Member>
         <Member Name="Completed">
           <Annotation Term="OData.Description" String="Task was completed."/>
-          <Annotation Term="OData.LongDescription" String="This value shall represent that the task completed sucessfully or with warnings."/>
+          <Annotation Term="OData.LongDescription" String="This value shall represent that the task completed successfully or with warnings."/>
         </Member>
         <Member Name="Killed">
           <Annotation Term="OData.Description" String="Task was terminated."/>
@@ -221,6 +221,12 @@
       <Annotation Term="OData.Description" String="This version was created to clarify the descriptions of the StartTime and EndTime properties.  It was also created to update descriptions that this schema defines."/>
       <EntityType Name="Task" BaseType="Task.v1_0_7.Task"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_0_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Task" BaseType="Task.v1_0_8.Task"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -278,6 +284,12 @@
       <Annotation Term="OData.Description" String="This version was created to clarify the descriptions of the StartTime and EndTime properties.  It was also created to update descriptions that this schema defines."/>
       <EntityType Name="Task" BaseType="Task.v1_1_4.Task"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_1_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Task" BaseType="Task.v1_1_5.Task"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -316,6 +328,12 @@
       <Annotation Term="OData.Description" String="This version was created to clarify the descriptions of the StartTime and EndTime properties.  It was also created to update descriptions that this schema defines."/>
       <EntityType Name="Task" BaseType="Task.v1_2_3.Task"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Task" BaseType="Task.v1_2_4.Task"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -386,6 +404,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions of the HidePayload property."/>
       <EntityType Name="Task" BaseType="Task.v1_3_3.Task"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Task" BaseType="Task.v1_3_4.Task"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -419,6 +443,12 @@
       <Annotation Term="OData.Description" String="This version was created to update the descriptions of the HidePayload property."/>
       <EntityType Name="Task" BaseType="Task.v1_4_2.Task"/>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Task" BaseType="Task.v1_4_3.Task"/>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -433,6 +463,12 @@
         </NavigationProperty>
       </EntityType>
     </Schema>
+    
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Task.v1_5_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Task" BaseType="Task.v1_5_0.Task"/>
+    </Schema>
 
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/TelemetryService_v1.xml b/static/redfish/v1/schema/TelemetryService_v1.xml
index 0dd0bf1..49b21a3 100644
--- a/static/redfish/v1/schema/TelemetryService_v1.xml
+++ b/static/redfish/v1/schema/TelemetryService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  TelemetryService v1.2.1                                             -->
+<!--# Redfish Schema:  TelemetryService v1.3.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -103,12 +103,53 @@
               <Record>
                 <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
                 <PropertyValue Property="Version" String="v1_1_0"/>
-                <PropertyValue Property="Description" String="This property has been deprecated in favor of using the property 'GeneratedMetricReportValues'."/>
               </Record>
             </Collection>
           </Annotation>
         </Parameter>
       </Action>
+
+      <Action Name="ClearMetricReports" IsBound="true">
+        <Annotation Term="OData.Description" String="The action to clear the metric reports for this telemetry service."/>
+        <Annotation Term="OData.LongDescription" String="This action shall delete all entries found in the metric report collection for this telemetry service."/>
+        <Parameter Name="TelemetryService" Type="TelemetryService.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+
+      <Action Name="ResetMetricReportDefinitionsToDefaults" IsBound="true">
+        <Annotation Term="OData.Description" String="The action to reset the metric report definitions to factory defaults."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset all entries found in the metric report definition collection to factory defaults.  This action might delete members of the metric report definition collection."/>
+        <Parameter Name="TelemetryService" Type="TelemetryService.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+
+      <Action Name="ResetTriggersToDefaults" IsBound="true">
+        <Annotation Term="OData.Description" String="The action to reset the triggers to factory defaults."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset all entries found in the triggers collection to factory defaults.  This action might delete members of the triggers collection."/>
+        <Parameter Name="TelemetryService" Type="TelemetryService.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_3_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_0_0">
@@ -224,8 +265,14 @@
       <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_0_2.TelemetryService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_0_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_0_3.TelemetryService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_1_0">
-      <Annotation Term="OData.Description" String="This version was created to add the GeneratedMetricReportValues property to the SubmittestMetricReport action."/>
+      <Annotation Term="OData.Description" String="This version was created to add the GeneratedMetricReportValues property to the SubmitTestMetricReport action."/>
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
 
@@ -283,6 +330,12 @@
       <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_1_2.TelemetryService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_1_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_1_3.TelemetryService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -302,5 +355,19 @@
       <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_2_0.TelemetryService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_2_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created specify 64-bit integers in OpenAPI."/>
+      <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_2_1.TelemetryService"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="TelemetryService.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add the ClearMetricReports, ResetMetricReportDefinitionsToDefaults, and ResetTriggersToDefaults actions."/>
+
+      <EntityType Name="TelemetryService" BaseType="TelemetryService.v1_2_2.TelemetryService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ThermalMetrics_v1.xml b/static/redfish/v1/schema/ThermalMetrics_v1.xml
new file mode 100644
index 0000000..c9379d0
--- /dev/null
+++ b/static/redfish/v1/schema/ThermalMetrics_v1.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  ThermalMetrics v1.0.0                                               -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2018-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Sensor_v1.xml">
+    <edmx:Include Namespace="Sensor"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ThermalMetrics">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="ThermalMetrics" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="The ThermalMetrics schema represents the thermal metrics of a chassis."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent the thermal metrics of a chassis for a Redfish implementation."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem/ThermalMetrics</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+
+      <Action Name="ResetMetrics" IsBound="true">
+        <Parameter Name="ThermalMetrics" Type="ThermalMetrics.v1_0_0.Actions"/>
+        <Annotation Term="OData.Description" String="This action resets the summary metrics related to this equipment."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset any time intervals or counted values for this equipment."/>
+      </Action>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ThermalMetrics.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="ThermalMetrics" BaseType="ThermalMetrics.ThermalMetrics">
+        <Property Name="TemperatureSummaryCelsius" Type="ThermalMetrics.v1_0_0.TemperatureSummary">
+          <Annotation Term="OData.Description" String="The summary temperature readings for this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature sensor readings for this subsystem."/>
+        </Property>
+        <NavigationProperty Name="TemperatureReadingsCelsius" Type="Collection(Sensor.Sensor)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy" String="Array"/>
+          <Annotation Term="OData.Description" String="The temperature readings from all related sensors for this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature sensors for this subsystem."/>
+        </NavigationProperty>
+        <Property Name="Actions" Type="ThermalMetrics.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="TemperatureSummary">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The temperature sensors for a subsystem."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain properties that describe temperature sensor for a subsystem."/>
+        <NavigationProperty Name="Internal" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The internal temperature of this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature reading for the internal temperature of this subsystem."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Intake" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The intake temperature of this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature reading for the intake temperature of this subsystem."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Exhaust" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The exhaust temperature of this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature reading for the exhaust temperature of this subsystem."/>
+        </NavigationProperty>
+        <NavigationProperty Name="Ambient" Type="Sensor.Sensor">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Redfish.ExcerptCopy"/>
+          <Annotation Term="OData.Description" String="The ambient temperature of this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the temperature reading for the ambient temperature of this subsystem."/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="ThermalMetrics.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/ThermalSubsystem_v1.xml b/static/redfish/v1/schema/ThermalSubsystem_v1.xml
new file mode 100644
index 0000000..4842fbe
--- /dev/null
+++ b/static/redfish/v1/schema/ThermalSubsystem_v1.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!---->
+<!--################################################################################       -->
+<!--# Redfish Schema:  ThermalSubsystem v1.0.0                                             -->
+<!--#                                                                                      -->
+<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
+<!--# available at http://www.dmtf.org/standards/redfish                                   -->
+<!--# Copyright 2014-2020 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://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
+    <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
+    <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
+    <edmx:Include Namespace="Resource"/>
+    <edmx:Include Namespace="Resource.v1_0_0"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Redundancy_v1.xml">
+    <edmx:Include Namespace="Redundancy"/>
+  </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/ThermalMetrics_v1.xml">
+    <edmx:Include Namespace="ThermalMetrics"/>
+  </edmx:Reference>
+
+  <edmx:DataServices>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ThermalSubsystem">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+
+      <EntityType Name="ThermalSubsystem" BaseType="Resource.v1_0_0.Resource" Abstract="true">
+        <Annotation Term="OData.Description" String="This ThermalSubsystem schema contains the definition for the thermal subsystem of a chassis."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a thermal subsystem for a Redfish implementation."/>
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/Chassis/{ChassisId}/ThermalSubsystem</String>
+          </Collection>
+        </Annotation>
+      </EntityType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ThermalSubsystem.v1_0_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="ThermalSubsystem" BaseType="ThermalSubsystem.ThermalSubsystem">
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The status and health of the resource and its subordinate or dependent resources."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any status or health properties of the resource."/>
+        </Property>
+        <NavigationProperty Name="Fans" Type="FanCollection.FanCollection" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the collection of fans within this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type FanCollection."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="FanRedundancy" Type="Collection(Redundancy.RedundantGroup)" Nullable="false">
+          <Annotation Term="OData.Description" String="The redundancy information for the groups of fans in this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain redundancy information for the groups of fans in this subsystem."/>
+        </Property>
+        <NavigationProperty Name="ThermalMetrics" Type="ThermalMetrics.ThermalMetrics" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the summary of thermal metrics for this subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource collection of type ThermalMetrics."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <Property Name="Actions" Type="ThermalSubsystem.v1_0_0.Actions" Nullable="false">
+          <Annotation Term="OData.Description" String="The available actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="The Actions property shall contain the available actions for this resource."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Actions">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The available actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/>
+        <Property Name="Oem" Type="ThermalSubsystem.v1_0_0.OemActions" Nullable="false">
+          <Annotation Term="OData.Description" String="This property contains the available OEM specific actions for this resource."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain any additional OEM actions for this resource."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="OemActions">
+        <Annotation Term="OData.AdditionalProperties" Bool="true"/>
+        <Annotation Term="OData.Description" String="The available OEM specific actions for this resource."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain any additional OEM actions for this resource."/>
+      </ComplexType>
+    </Schema>
+
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/static/redfish/v1/schema/Thermal_v1.xml b/static/redfish/v1/schema/Thermal_v1.xml
index 6a51f43..ef9dcaa 100644
--- a/static/redfish/v1/schema/Thermal_v1.xml
+++ b/static/redfish/v1/schema/Thermal_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Thermal v1.6.2                                                      -->
+<!--# Redfish Schema:  Thermal v1.7.0                                                      -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -65,6 +65,15 @@
             <String>/redfish/v1/Chassis/{ChassisId}/Thermal</String>
           </Collection>
         </Annotation>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Deprecated"/>
+              <PropertyValue Property="Version" String="v1_7_0"/>
+              <PropertyValue Property="Description" String="This schema has been deprecated in favor of the ThermalSubsystem schema."/>
+            </Record>
+          </Collection>
+        </Annotation>
       </EntityType>
 
     </Schema>
@@ -902,5 +911,17 @@
       <EntityType Name="Fan" BaseType="Thermal.v1_6_1.Fan"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Thermal.v1_7_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to deprecate the schema."/>
+
+      <EntityType Name="Thermal" BaseType="Thermal.v1_6_2.Thermal"/>
+
+      <EntityType Name="Temperature" BaseType="Thermal.v1_6_2.Temperature"/>
+
+      <EntityType Name="Fan" BaseType="Thermal.v1_6_2.Fan"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Triggers_v1.xml b/static/redfish/v1/schema/Triggers_v1.xml
index 37ab197..733a4ff 100644
--- a/static/redfish/v1/schema/Triggers_v1.xml
+++ b/static/redfish/v1/schema/Triggers_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Triggers v1.1.2                                                     -->
+<!--# Redfish Schema:  Triggers v1.1.3                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -198,7 +198,7 @@
         <Property Name="DwellTime" Type="Edm.Duration">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The duration the sensor value must violate the threshold before the threshold is activated."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the duration the sensor value must violate the threshold before the threshold is activated."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the duration the sensor value violates the threshold before the threshold is activated."/>
         </Property>
       </ComplexType>
 
@@ -261,7 +261,7 @@
         <Property Name="DwellTime" Type="Edm.Duration">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The amount of time that a trigger event persists before the metric action is performed."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the amount of time that a trigger event persists before the MetricAction is performed."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the amount of time that a trigger event persists before the TriggerActions are performed."/>
         </Property>
         <Property Name="Severity" Type="Resource.Health">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -311,6 +311,12 @@
       <EntityType Name="Triggers" BaseType="Triggers.v1_0_3.Triggers"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Triggers.v1_0_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Triggers" BaseType="Triggers.v1_0_4.Triggers"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Triggers.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -352,5 +358,11 @@
       <EntityType Name="Triggers" BaseType="Triggers.v1_1_1.Triggers"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Triggers.v1_1_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="Triggers" BaseType="Triggers.v1_1_2.Triggers"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/UpdateService_v1.xml b/static/redfish/v1/schema/UpdateService_v1.xml
index d8c87f5..ce70dac 100644
--- a/static/redfish/v1/schema/UpdateService_v1.xml
+++ b/static/redfish/v1/schema/UpdateService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  UpdateService v1.8.2                                                -->
+<!--# Redfish Schema:  UpdateService v1.8.3                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -75,7 +75,7 @@
         </Parameter>
         <Parameter Name="TransferProtocol" Type="UpdateService.v1_0_0.TransferProtocolType">
           <Annotation Term="OData.Description" String="The network protocol that the update service uses to retrieve the software image file located at the URI provided in ImageURI.  This parameter is ignored if the URI provided in ImageURI contains a scheme."/>
-          <Annotation Term="OData.LongDescription" String="This parameter shall contain the network protocol that the update service shall use to retreive the software image located at the ImageURI.  Services should ignore this parameter if the URI provided in ImageURI contains a scheme.  If this parameter is not provided (or supported), and a transfer protocol is not specified by a scheme contained within this URI, the service shall use HTTP to retrieve the image."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the network protocol that the update service shall use to retrieve the software image located at the ImageURI.  Services should ignore this parameter if the URI provided in ImageURI contains a scheme.  If this parameter is not provided (or supported), and a transfer protocol is not specified by a scheme contained within this URI, the service shall use HTTP to retrieve the image."/>
         </Parameter>
         <Parameter Name="Targets" Type="Collection(Edm.String)">
           <Annotation Term="OData.Description" String="An array of URIs that indicate where to apply the update image."/>
@@ -292,6 +292,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_0_8.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_0_9.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.3"/>
@@ -354,6 +360,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_1_7.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_1_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_1_8.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -414,10 +426,16 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_2_6.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_2_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_2_7.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
-      <Annotation Term="OData.Description" String="This version was created to deprecate NSF in favor of NFS in the TransferProtocolType enum."/>
+      <Annotation Term="OData.Description" String="This version was created to deprecate NSF in favor of NFS in the TransferProtocolType enumeration."/>
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_2_2.UpdateService"/>
     </Schema>
 
@@ -451,6 +469,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_3_4.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_3_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_3_5.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -490,12 +514,12 @@
         <Property Name="MaintenanceWindowStartTime" Type="Edm.DateTimeOffset" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The start time of a maintenance window."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the HttpPushUri-provided software as part of a maintenance window.  This property shall contain required if the HttpPushUriApplyTime property value is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the date and time when the service can start to apply the HttpPushUri-provided software as part of a maintenance window.  This property shall be required if the HttpPushUriApplyTime property value is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/>
         </Property>
         <Property Name="MaintenanceWindowDurationInSeconds" Type="Edm.Int64" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The expiry time, in seconds, of the maintenance window."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate the end of the maintenance window as the number of seconds after the time specified by the HttpPushUriMaintenanceWindowStartTime property.  This property shall contain required if the HttpPushUriApplyTime property value is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the end of the maintenance window as the number of seconds after the time specified by the MaintenanceWindowStartTime property.  This property shall be required if the HttpPushUriApplyTime property value is `AtMaintenanceWindowStart` or `InMaintenanceWindowOnReset`."/>
           <Annotation Term="Validation.Minimum" Int="0"/>
           <Annotation Term="Measures.Unit" String="s"/>
         </Property>
@@ -545,6 +569,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_4_3.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_4_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_4_4.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -577,6 +607,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_5_2.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_5_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_5_3.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
@@ -615,6 +651,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_6_1.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_6_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_6_2.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_7_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.3"/>
@@ -635,6 +677,12 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_7_1.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_7_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_7_2.UpdateService"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -661,5 +709,11 @@
       <EntityType Name="UpdateService" BaseType="UpdateService.v1_8_1.UpdateService"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_8_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to correct various typographical errors."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_8_2.UpdateService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/VLanNetworkInterface_v1.xml b/static/redfish/v1/schema/VLanNetworkInterface_v1.xml
index 4c895c1..15cd1d3 100644
--- a/static/redfish/v1/schema/VLanNetworkInterface_v1.xml
+++ b/static/redfish/v1/schema/VLanNetworkInterface_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  VLanNetworkInterface v1.1.5                                         -->
+<!--# Redfish Schema:  VLanNetworkInterface v1.2.0                                         -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -222,5 +222,32 @@
       <EntityType Name="VLanNetworkInterface" BaseType="VLanNetworkInterface.v1_1_4.VLanNetworkInterface"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VLanNetworkInterface.v1_2_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add VLAN priority."/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+
+      <EntityType Name="VLanNetworkInterface" BaseType="VLanNetworkInterface.v1_1_5.VLanNetworkInterface">
+        <Property Name="VLANPriority" Type="VLanNetworkInterface.v1_2_0.VLANPriority">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The priority for this VLAN."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the priority for this VLAN."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="VLAN" BaseType="VLanNetworkInterface.v1_0_0.VLAN">
+        <Property Name="VLANPriority" Type="VLanNetworkInterface.v1_2_0.VLANPriority">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The priority for this VLAN."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the priority for this VLAN."/>
+        </Property>
+      </ComplexType>
+
+      <TypeDefinition Name="VLANPriority" UnderlyingType="Edm.Int64">
+        <Annotation Term="Validation.Minimum" Int="0"/>
+        <Annotation Term="Validation.Maximum" Int="7"/>
+      </TypeDefinition>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/VirtualMedia_v1.xml b/static/redfish/v1/schema/VirtualMedia_v1.xml
index 5cbe363..3fa6990 100644
--- a/static/redfish/v1/schema/VirtualMedia_v1.xml
+++ b/static/redfish/v1/schema/VirtualMedia_v1.xml
@@ -314,7 +314,7 @@
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VirtualMedia.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
-      <Annotation Term="OData.Description" String="This version was created to change the permissions of Image, Inserted, and WriteProtected and to add the InsertMedia and InjectMedia actions."/>
+      <Annotation Term="OData.Description" String="This version was created to change the permissions of Image, Inserted, and WriteProtected and to add the InsertMedia and EjectMedia actions."/>
       <EntityType Name="VirtualMedia" BaseType="VirtualMedia.v1_1_1.VirtualMedia"/>
     </Schema>
 
diff --git a/static/redfish/v1/schema/Volume_v1.xml b/static/redfish/v1/schema/Volume_v1.xml
index 543ff27..4cfb8f7 100644
--- a/static/redfish/v1/schema/Volume_v1.xml
+++ b/static/redfish/v1/schema/Volume_v1.xml
@@ -124,8 +124,12 @@
       </EntityType>
 
       <Action Name="Initialize" IsBound="true">
-        <Annotation Term="OData.Description" String="This action is used to prepare the contents of the volume for use by the system. If InitializeMethod is not specified in the request body, the InitializeMethod should be Foreground."/>
-        <Annotation Term="OData.LongDescription" String="This defines the name of the custom action supported on this resource. If InitializeMethod is not specified in the request body, the InitializeMethod should be Foreground."/>
+        <Annotation
+          Term="OData.Description"
+          String="This action is used to prepare the contents of the volume for use by the system. If InitializeMethod is not specified in the request body, but the property InitializeMethod is specified, the property InitializeMethod value should be used. If neither is specified, the InitializeMethod should be Foreground."/>
+        <Annotation
+          Term="OData.LongDescription"
+          String="This defines the name of the custom action supported on this resource. If InitializeMethod is not specified in the request body, but the property InitializeMethod is specified, the property InitializeMethod value should be used. If neither is specified, the InitializeMethod should be Foreground."/>
         <Parameter Name="Volume" Type="Volume.v1_0_0.Actions"/>
         <Parameter Name="InitializeMethod" Type="Volume.InitializeMethod">
           <Annotation Term="OData.Description" String="The type of initialization to be performed."/>
@@ -533,20 +537,20 @@
           <Annotation Term="OData.LongDescription" String="The support for addressing the write hole issue is disabled. The volume is not performing any additional activities to close the RAID write hole."/>
         </Member>
         <Member Name="Journaling">
-          <Annotation Term="OData.Description" String="The policy that uses separate block device for write-ahead logging to adddress write hole issue."/>
+          <Annotation Term="OData.Description" String="The policy that uses separate block device for write-ahead logging to address write hole issue."/>
           <Annotation
             Term="OData.LongDescription"
-            String="The policy that uses separate block device for write-ahead logging to adddress write hole issue. All write operations on the RAID volume are first logged on dedicated journaling device that is not part of the volume."/>
+            String="The policy that uses separate block device for write-ahead logging to address write hole issue. All write operations on the RAID volume are first logged on dedicated journaling device that is not part of the volume."/>
         </Member>
         <Member Name="DistributedLog">
           <Annotation Term="OData.Description" String="The policy that distributes additional log among the volume's capacity sources to address write hole issue."/>
           <Annotation
             Term="OData.LongDescription"
-            String="The policy that distributes additional log (e.q. cheksum of the parity) among the volume's capacity sources to address write hole issue. Additional data is used to detect data corruption on the volume."/>
+            String="The policy that distributes additional log (e.q. checksum of the parity) among the volume's capacity sources to address write hole issue. Additional data is used to detect data corruption on the volume."/>
         </Member>
         <Member Name="Oem">
           <Annotation Term="OData.Description" String="The policy that is Oem specific."/>
-          <Annotation Term="OData.LongDescription" String="The policy that is Oem specific. The mechanism details are unknown unless provided separatly by the Oem."/>
+          <Annotation Term="OData.LongDescription" String="The policy that is Oem specific. The mechanism details are unknown unless provided separately by the Oem."/>
         </Member>
       </EnumType>
 
@@ -871,7 +875,7 @@
 
       <ComplexType Name="Links" BaseType="Volume.v1_1_0.Links">
         <NavigationProperty Name="DedicatedSpareDrives" Type="Collection(Drive.Drive)">
-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An array of references to the drives which are dedicated spares for this volume."/>
           <Annotation
             Term="OData.LongDescription"
@@ -907,6 +911,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_2_3.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="OData.Description" String="This version was added to fix typographical errors."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_2_4.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="TP v1.0.6a"/>
@@ -966,6 +976,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_3_2.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_3_4">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="OData.Description" String="This version was added to fix typographical errors."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_3_3.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="WIP v1.1.0"/>
@@ -1084,6 +1100,12 @@
       <EntityType Name="Volume" BaseType="Volume.v1_4_1.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_4_3">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="OData.Description" String="This version was added to fix typographical errors."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_4_2.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="Redfish.Release" String="WIP v1.2.0"/>
@@ -1180,13 +1202,54 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
         </Property>
         <Property Name="SupportsIOPerformanceHints" Type="Edm.Boolean">
-          <Annotation Term="OData.Description" String="Indicates that the Namepsace Atomic Write Unit Normal (NAWUN), Namespace Atomic Write Unit Power Fail (NAWUPF), and Namespace Atomic Compare and Write Unit (NACWU) fields are defined for this namespace and should be used by the host for this namespace instead of the controller-level properties AWUN, AWUPF, and ACWU."/>
-          <Annotation Term="OData.LongDescription" String="This property shall indicate that the Namepsace Atomic Write Unit Normal (NAWUN), Namespace Atomic Write Unit Power Fail (NAWUPF), and Namespace Atomic Compare and Write Unit (NACWU) fields are defined for this namespace and should be used by the host for this namespace instead of the controller-level properties AWUN, AWUPF, and ACWU."/>
+          <Annotation Term="OData.Description" String="Indicates that the Namespace Atomic Write Unit Normal (NAWUN), Namespace Atomic Write Unit Power Fail (NAWUPF), and Namespace Atomic Compare and Write Unit (NACWU) fields are defined for this namespace and should be used by the host for this namespace instead of the controller-level properties AWUN, AWUPF, and ACWU."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate that the Namespace Atomic Write Unit Normal (NAWUN), Namespace Atomic Write Unit Power Fail (NAWUPF), and Namespace Atomic Compare and Write Unit (NACWU) fields are defined for this namespace and should be used by the host for this namespace instead of the controller-level properties AWUN, AWUPF, and ACWU."/>
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
         </Property>
       </ComplexType>
 
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_5_1">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="OData.Description" String="This version was added to fix typographical errors."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_5_0.Volume"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_6_0">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="Redfish.Release" String="TP v1.2.1"/>
+
+      <Annotation Term="OData.Description" String="This version was created to add the InitializeMethod property. It also changes the DedicatedSpareDrives property in Links to Read/Write."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_5_0.Volume">
+        <Property Name="InitializeMethod" Type="Volume.InitializeMethod">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates the Initialization Method used for this volume. If InitializeMethod is not specified, the InitializeMethod should be Foreground."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="This property shall indicate the initiatialization method used for this volume. If InitializeMethod is not specified, the InitializeMethod should be Foreground. This value reflects the most recently used Initialization Method, and may be changed using the Initialize Action."/>
+        </Property>
+      </EntityType>
+      <ComplexType Name="Links" BaseType="Volume.v1_5_0.Links">
+        <Annotation Term="OData.Description" String="Add a reference to Journaling Media and OwningStorageResource associated with this Volume."/>
+        <NavigationProperty Name="CacheVolumeSource" Type="Volume.Volume">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A pointer to the cache volume source for this volume."/>
+          <Annotation Term="OData.LongDescription" String="This shall be a pointer to the cache volume source for this volume. The corresponding VolumeUsage property shall be set to Data when this property is used."/>
+        </NavigationProperty>
+        <NavigationProperty Name="CacheDataVolumes" Type="Collection(Volume.Volume)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A pointer to the data volumes this volume serves as a cache volume."/>
+          <Annotation Term="OData.LongDescription" String="This shall be a pointer to the cache data volumes this volume serves as a cache volume.  The corresponding VolumeUsage property shall be set to CacheOnly when this property is used."/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_6_1">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="OData.Description" String="This version was added to fix typographical errors."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_6_0.Volume"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Zone_v1.xml b/static/redfish/v1/schema/Zone_v1.xml
index 9dbfbf9..6db7c3e 100644
--- a/static/redfish/v1/schema/Zone_v1.xml
+++ b/static/redfish/v1/schema/Zone_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Zone v1.5.0                                                         -->
+<!--# Redfish Schema:  Zone v1.6.0                                                         -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -363,15 +363,27 @@
       <EnumType Name="ZoneType">
         <Member Name="Default">
           <Annotation Term="OData.Description" String="The zone in which all endpoints are added by default when instantiated."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate a zone in which all endpoints are added by default when instantiated."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a zone in which all endpoints are added by default when instantiated.  This value shall only be used for zones subordinate to the fabric collection."/>
         </Member>
         <Member Name="ZoneOfEndpoints">
           <Annotation Term="OData.Description" String="A zone that contains endpoints."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate a zone that contains resources of type Endpoint."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a zone that contains resources of type Endpoint.  This value shall only be used for zones subordinate to the fabric collection."/>
         </Member>
         <Member Name="ZoneOfZones">
           <Annotation Term="OData.Description" String="A zone that contains zones."/>
-          <Annotation Term="OData.LongDescription" String="This value shall indicate a zone that contains resources of type Zone."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a zone that contains resources of type Zone.  This value shall only be used for zones subordinate to the fabric collection."/>
+        </Member>
+        <Member Name="ZoneOfResourceBlocks">
+          <Annotation Term="OData.Description" String="A zone that contains resource blocks."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate a zone that contains resources of type ResourceBlock.  This value shall only be used for zones subordinate to the composition service."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_6_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
         </Member>
       </EnumType>
 
@@ -417,5 +429,13 @@
       <EntityType Name="Zone" BaseType="Zone.v1_4_2.Zone"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Zone.v1_6_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2020.4"/>
+      <Annotation Term="OData.Description" String="This version was created to add `ZoneOfResourceBlocks` to ZoneType."/>
+
+      <EntityType Name="Zone" BaseType="Zone.v1_5_0.Zone"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>