diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 9b4c88f..903afb7 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -9,7 +9,7 @@
 
 import xml.etree.ElementTree as ET
 
-VERSION = "DSP8010_2021.2"
+VERSION = "DSP8010_2021.3"
 
 # To use a new schema, add to list and rerun tool
 include_list = [
@@ -161,9 +161,9 @@
         " Version=\"4.0\">\n")
 
     for zip_filepath in zip_ref.namelist():
-        if zip_filepath.startswith(VERSION + '/' + VERSION + '/csdl/') and \
+        if zip_filepath.startswith('csdl/') and \
             (zip_filepath != VERSION + "/csdl/") and \
-                (zip_filepath != VERSION + '/' + VERSION + "/csdl/"):
+                (zip_filepath != "csdl/"):
             filename = os.path.basename(zip_filepath)
 
             # filename looks like Zone_v1.xml
@@ -260,7 +260,7 @@
 
 schema_files = {}
 for zip_filepath in zip_ref.namelist():
-    if zip_filepath.startswith(os.path.join(VERSION, VERSION, 'json-schema/')):
+    if zip_filepath.startswith(os.path.join('json-schema/')):
         filename = os.path.basename(zip_filepath)
         filenamesplit = filename.split(".")
 
@@ -281,7 +281,7 @@
 
 for schema, version in schema_files.items():
     basename = schema + "." + version + ".json"
-    zip_filepath = os.path.join(VERSION, VERSION, "json-schema", basename)
+    zip_filepath = os.path.join("json-schema", basename)
     schemadir = os.path.join(json_schema_path, schema)
     os.makedirs(schemadir)
     location_json = OrderedDict()
diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml
index 66b6faf..f936591 100644
--- a/static/redfish/v1/$metadata/index.xml
+++ b/static/redfish/v1/$metadata/index.xml
@@ -191,6 +191,7 @@
         <edmx:Include Namespace="Certificate.v1_2_3"/>
         <edmx:Include Namespace="Certificate.v1_3_0"/>
         <edmx:Include Namespace="Certificate.v1_4_0"/>
+        <edmx:Include Namespace="Certificate.v1_5_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/CertificateCollection_v1.xml">
         <edmx:Include Namespace="CertificateCollection"/>
@@ -345,6 +346,7 @@
         <edmx:Include Namespace="Chassis.v1_15_1"/>
         <edmx:Include Namespace="Chassis.v1_16_0"/>
         <edmx:Include Namespace="Chassis.v1_17_0"/>
+        <edmx:Include Namespace="Chassis.v1_18_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ChassisCollection_v1.xml">
         <edmx:Include Namespace="ChassisCollection"/>
@@ -438,6 +440,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_5_8"/>
         <edmx:Include Namespace="ComputerSystem.v1_5_9"/>
         <edmx:Include Namespace="ComputerSystem.v1_5_10"/>
+        <edmx:Include Namespace="ComputerSystem.v1_5_11"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_2"/>
@@ -447,6 +450,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_6_6"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_7"/>
         <edmx:Include Namespace="ComputerSystem.v1_6_8"/>
+        <edmx:Include Namespace="ComputerSystem.v1_6_9"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_2"/>
@@ -455,6 +459,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_7_5"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_6"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_7"/>
+        <edmx:Include Namespace="ComputerSystem.v1_7_8"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_2"/>
@@ -462,6 +467,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_8_4"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_5"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_6"/>
+        <edmx:Include Namespace="ComputerSystem.v1_8_7"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_2"/>
@@ -469,28 +475,36 @@
         <edmx:Include Namespace="ComputerSystem.v1_9_4"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_5"/>
         <edmx:Include Namespace="ComputerSystem.v1_9_6"/>
+        <edmx:Include Namespace="ComputerSystem.v1_9_7"/>
         <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_10_5"/>
+        <edmx:Include Namespace="ComputerSystem.v1_10_6"/>
         <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_11_4"/>
+        <edmx:Include Namespace="ComputerSystem.v1_11_5"/>
         <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_12_3"/>
+        <edmx:Include Namespace="ComputerSystem.v1_12_4"/>
         <edmx:Include Namespace="ComputerSystem.v1_13_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_13_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_13_2"/>
+        <edmx:Include Namespace="ComputerSystem.v1_13_3"/>
         <edmx:Include Namespace="ComputerSystem.v1_14_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_14_1"/>
+        <edmx:Include Namespace="ComputerSystem.v1_14_2"/>
         <edmx:Include Namespace="ComputerSystem.v1_15_0"/>
+        <edmx:Include Namespace="ComputerSystem.v1_15_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_16_0"/>
+        <edmx:Include Namespace="ComputerSystem.v1_16_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ComputerSystemCollection_v1.xml">
         <edmx:Include Namespace="ComputerSystemCollection"/>
@@ -745,6 +759,7 @@
         <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_0_10"/>
         <edmx:Include Namespace="EventDestination.v1_1_0"/>
         <edmx:Include Namespace="EventDestination.v1_1_1"/>
         <edmx:Include Namespace="EventDestination.v1_1_2"/>
@@ -754,6 +769,7 @@
         <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_1_9"/>
         <edmx:Include Namespace="EventDestination.v1_2_0"/>
         <edmx:Include Namespace="EventDestination.v1_2_1"/>
         <edmx:Include Namespace="EventDestination.v1_2_2"/>
@@ -761,38 +777,48 @@
         <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_2_7"/>
         <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_3_5"/>
         <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_4_4"/>
         <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_5_3"/>
         <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_6_3"/>
+        <edmx:Include Namespace="EventDestination.v1_6_4"/>
         <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_7_3"/>
+        <edmx:Include Namespace="EventDestination.v1_7_4"/>
         <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_8_3"/>
+        <edmx:Include Namespace="EventDestination.v1_8_4"/>
         <edmx:Include Namespace="EventDestination.v1_9_0"/>
         <edmx:Include Namespace="EventDestination.v1_9_1"/>
         <edmx:Include Namespace="EventDestination.v1_9_2"/>
         <edmx:Include Namespace="EventDestination.v1_9_3"/>
+        <edmx:Include Namespace="EventDestination.v1_9_4"/>
         <edmx:Include Namespace="EventDestination.v1_10_0"/>
         <edmx:Include Namespace="EventDestination.v1_10_1"/>
         <edmx:Include Namespace="EventDestination.v1_10_2"/>
+        <edmx:Include Namespace="EventDestination.v1_10_3"/>
         <edmx:Include Namespace="EventDestination.v1_11_0"/>
+        <edmx:Include Namespace="EventDestination.v1_11_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/EventDestinationCollection_v1.xml">
         <edmx:Include Namespace="EventDestinationCollection"/>
@@ -960,6 +986,7 @@
         <edmx:Include Namespace="LogEntry.v1_7_1"/>
         <edmx:Include Namespace="LogEntry.v1_8_0"/>
         <edmx:Include Namespace="LogEntry.v1_9_0"/>
+        <edmx:Include Namespace="LogEntry.v1_10_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/LogEntryCollection_v1.xml">
         <edmx:Include Namespace="LogEntryCollection"/>
@@ -1147,18 +1174,23 @@
         <edmx:Include Namespace="ManagerAccount.v1_4_3"/>
         <edmx:Include Namespace="ManagerAccount.v1_4_4"/>
         <edmx:Include Namespace="ManagerAccount.v1_4_5"/>
+        <edmx:Include Namespace="ManagerAccount.v1_4_6"/>
         <edmx:Include Namespace="ManagerAccount.v1_5_0"/>
         <edmx:Include Namespace="ManagerAccount.v1_5_1"/>
         <edmx:Include Namespace="ManagerAccount.v1_5_2"/>
         <edmx:Include Namespace="ManagerAccount.v1_5_3"/>
         <edmx:Include Namespace="ManagerAccount.v1_5_4"/>
+        <edmx:Include Namespace="ManagerAccount.v1_5_5"/>
         <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_6_3"/>
+        <edmx:Include Namespace="ManagerAccount.v1_6_4"/>
         <edmx:Include Namespace="ManagerAccount.v1_7_0"/>
         <edmx:Include Namespace="ManagerAccount.v1_7_1"/>
+        <edmx:Include Namespace="ManagerAccount.v1_7_2"/>
         <edmx:Include Namespace="ManagerAccount.v1_8_0"/>
+        <edmx:Include Namespace="ManagerAccount.v1_8_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ManagerAccountCollection_v1.xml">
         <edmx:Include Namespace="ManagerAccountCollection"/>
@@ -1355,6 +1387,7 @@
         <edmx:Include Namespace="MessageRegistry.v1_4_0"/>
         <edmx:Include Namespace="MessageRegistry.v1_4_1"/>
         <edmx:Include Namespace="MessageRegistry.v1_4_2"/>
+        <edmx:Include Namespace="MessageRegistry.v1_5_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MessageRegistryCollection_v1.xml">
         <edmx:Include Namespace="MessageRegistryCollection"/>
@@ -1386,10 +1419,13 @@
         <edmx:Include Namespace="MetricDefinition.v1_0_5"/>
         <edmx:Include Namespace="MetricDefinition.v1_0_6"/>
         <edmx:Include Namespace="MetricDefinition.v1_0_7"/>
+        <edmx:Include Namespace="MetricDefinition.v1_0_8"/>
         <edmx:Include Namespace="MetricDefinition.v1_1_0"/>
         <edmx:Include Namespace="MetricDefinition.v1_1_1"/>
         <edmx:Include Namespace="MetricDefinition.v1_1_2"/>
+        <edmx:Include Namespace="MetricDefinition.v1_1_3"/>
         <edmx:Include Namespace="MetricDefinition.v1_2_0"/>
+        <edmx:Include Namespace="MetricDefinition.v1_2_1"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/MetricDefinitionCollection_v1.xml">
         <edmx:Include Namespace="MetricDefinitionCollection"/>
@@ -1504,6 +1540,7 @@
         <edmx:Include Namespace="PCIeDevice.v1_6_0"/>
         <edmx:Include Namespace="PCIeDevice.v1_6_1"/>
         <edmx:Include Namespace="PCIeDevice.v1_7_0"/>
+        <edmx:Include Namespace="PCIeDevice.v1_8_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/PCIeDeviceCollection_v1.xml">
         <edmx:Include Namespace="PCIeDeviceCollection"/>
@@ -1969,6 +2006,7 @@
         <edmx:Include Namespace="ServiceRoot.v1_9_0"/>
         <edmx:Include Namespace="ServiceRoot.v1_10_0"/>
         <edmx:Include Namespace="ServiceRoot.v1_11_0"/>
+        <edmx:Include Namespace="ServiceRoot.v1_12_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Session_v1.xml">
         <edmx:Include Namespace="Session"/>
@@ -2152,6 +2190,7 @@
         <edmx:Include Namespace="StorageController.v1_1_1"/>
         <edmx:Include Namespace="StorageController.v1_2_0"/>
         <edmx:Include Namespace="StorageController.v1_3_0"/>
+        <edmx:Include Namespace="StorageController.v1_4_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/StorageControllerCollection_v1.xml">
         <edmx:Include Namespace="StorageControllerCollection"/>
diff --git a/static/redfish/v1/JsonSchemas/Certificate/Certificate.json b/static/redfish/v1/JsonSchemas/Certificate/Certificate.json
index a8dcf82..ae808c6 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_4_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Certificate.v1_5_0.json",
     "$ref": "#/definitions/Certificate",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -178,6 +178,19 @@
                     "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."
                 },
+                "SPDM": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SPDM"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "SPDM-related information for the certificate.",
+                    "longDescription": "The value of this property shall contain SPDM-related information for the certificate.  This property shall only be present for SPDM certificates.",
+                    "versionAdded": "v1_5_0"
+                },
                 "SerialNumber": {
                     "description": "The serial number of the certificate.",
                     "longDescription": "The value of this property shall be a string containing the ASCII representation of the serial number of the certificate, as defined by the RFC5280 'serialNumber' field.",
@@ -575,9 +588,41 @@
                 "CSRString"
             ],
             "type": "object"
+        },
+        "SPDM": {
+            "additionalProperties": false,
+            "description": "SPDM-related information for a certificate.",
+            "longDescription": "This type shall contain contain SPDM-related information for a certificate.",
+            "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": {
+                "SlotId": {
+                    "description": "Slot identifier of the certificate.",
+                    "longDescription": "The value of this property shall contain an integer between 0 and 7, inclusive, that represents the slot identifier for an SPDM-provided certificate.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                }
+            },
+            "type": "object"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2021.2",
-    "title": "#Certificate.v1_4_0.Certificate"
+    "release": "2021.3",
+    "title": "#Certificate.v1_5_0.Certificate"
 }
\ 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 dbf6be8..15490ae 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_17_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Chassis.v1_18_0.json",
     "$ref": "#/definitions/Chassis",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -135,6 +135,33 @@
                     "longDescription": "This property shall contain a link to a resource collection of type DriveCollection.",
                     "versionAdded": "v1_14_0"
                 },
+                "ElectricalSourceManagerURIs": {
+                    "description": "The URIs of the management interfaces for the upstream electrical source connections for this chassis.",
+                    "format": "uri-reference",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of URIs to the management applications or devices that provide monitoring or control of the upstream electrical sources that provide power to this chassis.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_18_0"
+                },
+                "ElectricalSourceNames": {
+                    "description": "The names of the upstream electrical sources, such as circuits or outlets, connected to this chassis.",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "This property shall contain an arrays of strings that identify the upstream electrical sources, such as the names of circuits or outlets, that provide power to this chassis.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_18_0"
+                },
                 "EnvironmentMetrics": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/EnvironmentMetrics.json#/definitions/EnvironmentMetrics",
                     "description": "The link to the environment metrics for this chassis.",
@@ -720,6 +747,19 @@
                 "PCIeDevices@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
+                "PowerOutlets": {
+                    "description": "An array of links to the outlets that provide power to this chassis.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Outlet.json#/definitions/Outlet"
+                    },
+                    "longDescription": "This property shall contain an array of links to resources of type Outlet that represent the outlets that provide power to this chassis.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_18_0"
+                },
+                "PowerOutlets@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "PoweredBy": {
                     "description": "An array of links to resources or objects that power this chassis.  Normally, the link is for either a chassis or a specific set of power supplies.",
                     "items": {
@@ -923,6 +963,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2021.2",
-    "title": "#Chassis.v1_17_0.Chassis"
+    "release": "2021.3",
+    "title": "#Chassis.v1_18_0.Chassis"
 }
\ 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 8f8a7f4..917d960 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_16_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_16_1.json",
     "$ref": "#/definitions/ComputerSystem",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -190,7 +190,7 @@
                     "versionAdded": "v1_5_0"
                 },
                 "BootOrder": {
-                    "description": "An array of BootOptionReference strings that represent the persistent boot order for with this computer system.",
+                    "description": "An array of BootOptionReference strings that represent the persistent boot order for with this computer system.  Changes to the boot order typically require a system reset before they take effect.  It is likely that a client finds the `@Redfish.Settings` term in this resource, and if it is found, the client makes requests to change boot order settings by modifying the resource identified by the `@Redfish.Settings` term.",
                     "items": {
                         "type": [
                             "string",
@@ -2286,5 +2286,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2021.2",
-    "title": "#ComputerSystem.v1_16_0.ComputerSystem"
+    "title": "#ComputerSystem.v1_16_1.ComputerSystem"
 }
\ 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 70ff1e4..2f7452c 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_11_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EventDestination.v1_11_1.json",
     "$ref": "#/definitions/EventDestination",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -147,7 +147,7 @@
                 "Destination": {
                     "description": "The URI of the destination event receiver.",
                     "format": "uri-reference",
-                    "longDescription": "This property shall contain a URI to the destination where the events are sent.  If Protocol is `SMTP`, the URI shall follow the RFC6068-described format.  SNMP URIs shall be consistent with RFC4088.  Specifically, for SNMPv3, if a username is specified in the SNMP URI, the SNMPv3 authentication and encryption configuration associated with that user shall be utilized in the SNMPv3 traps.  Syslog URIs shall be consistent with RFC3986 and contain the scheme `syslog://`.  For other URIs, such as HTTP or HTTPS, they shall be consistent with RFC3986.",
+                    "longDescription": "This property shall contain a URI to the destination where the events are sent.  If Protocol is `SMTP`, the URI shall follow the RFC6068-described format.  SNMP URIs shall be consistent with RFC4088.  Specifically, for SNMPv3, if a username is specified in the SNMP URI, the SNMPv3 authentication and encryption configuration associated with that user shall be utilized in the SNMPv3 traps.  Syslog URIs shall be consistent with RFC3986 and contain the scheme `syslog://`.  Server-sent event destinations shall be in the form `redfish-sse://ip:port` where `ip` and `port` are the IP address and the port of the client with the open SSE connection.  For other URIs, such as HTTP or HTTPS, they shall be consistent with RFC3986.",
                     "readonly": true,
                     "type": "string"
                 },
@@ -685,7 +685,7 @@
                 "RedfishEvent": "The subscription follows the Redfish Specification for event notifications.  To send an event notification, a service sends an HTTP POST to the subscriber's destination URI.",
                 "SNMPInform": "The subscription follows versions 2 and 3 of SNMP Inform for event notifications.",
                 "SNMPTrap": "The subscription follows the various versions of SNMP Traps for event notifications.",
-                "SSE": "The subscription follows the HTML5 Server-Sent Event definition for event notifications.",
+                "SSE": "The subscription follows the HTML5 server-sent event definition for event notifications.",
                 "Syslog": "The subscription sends Syslog messages for event notifications."
             },
             "enumLongDescriptions": {
@@ -842,5 +842,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2021.2",
-    "title": "#EventDestination.v1_11_0.EventDestination"
+    "title": "#EventDestination.v1_11_1.EventDestination"
 }
\ 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 aa2ca6f..c27c5e8 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_9_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_10_0.json",
     "$ref": "#/definitions/LogEntry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -83,14 +83,26 @@
                 "Manager",
                 "PreOS",
                 "OS",
-                "OEM"
+                "OEM",
+                "CPER",
+                "CPERSection"
             ],
             "enumDescriptions": {
+                "CPER": "UEFI Common Platform Error Record.",
+                "CPERSection": "A Section of a UEFI Common Platform Error Record.",
                 "Manager": "Manager diagnostic data.",
                 "OEM": "OEM diagnostic data.",
                 "OS": "Operating system (OS) diagnostic data.",
                 "PreOS": "Pre-OS diagnostic data."
             },
+            "enumLongDescriptions": {
+                "CPER": "This value shall indicate the data provided at the URI specified by the AdditionalDataURI property is a complete UEFI Specification-defined Common Platform Error Record.  The CPER data shall contain a Record Header and at least one Section as defined by the UEFI Specification.",
+                "CPERSection": "This value shall indicate the data provided at the URI specified by the AdditionalDataURI property is a single Section of a UEFI Specification-defined Common Platform Error Record.  The CPER data shall contain one Section as defined by the UEFI Specification, with no Record Header."
+            },
+            "enumVersionAdded": {
+                "CPER": "v1_10_0",
+                "CPERSection": "v1_10_0"
+            },
             "type": "string"
         },
         "LogEntry": {
@@ -676,6 +688,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2021.1",
-    "title": "#LogEntry.v1_9_0.LogEntry"
+    "release": "2021.3",
+    "title": "#LogEntry.v1_10_0.LogEntry"
 }
\ 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 44ba1e3..f552e71 100644
--- a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
+++ b/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_8_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_8_1.json",
     "$ref": "#/definitions/ManagerAccount",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -68,7 +68,7 @@
         "ManagerAccount": {
             "additionalProperties": false,
             "description": "The ManagerAccount schema defines the user accounts that are owned by a manager.  Changes to a manager account might affect the current Redfish service connection if this manager is responsible for the Redfish service.",
-            "longDescription": "This resource shall represent a user account for the manager in a Redfish implementation.",
+            "longDescription": "This resource shall represent a user account for the manager in a Redfish implementation.  The account shall indicate the allowed access to one of more services in the manager.",
             "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.",
@@ -108,7 +108,7 @@
                     "versionAdded": "v1_8_0"
                 },
                 "AccountTypes": {
-                    "description": "The account types.",
+                    "description": "The list of services in the manager that the account is allowed to access.",
                     "items": {
                         "anyOf": [
                             {
@@ -119,7 +119,7 @@
                             }
                         ]
                     },
-                    "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 may add additional values when this property is set or updated if allowed by the value of the StrictAccountTypes property.",
+                    "longDescription": "This property shall contain an array of the various manager services that the account is allowed to access.  This shall not include functionality for receiving events or other notifications.  If this property is not provided by the client, the default value shall be an array that contains the value `Redfish`.  The service may 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"
@@ -442,5 +442,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2021.1",
-    "title": "#ManagerAccount.v1_8_0.ManagerAccount"
+    "title": "#ManagerAccount.v1_8_1.ManagerAccount"
 }
\ 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 6dd58cd..327a65f 100644
--- a/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json
+++ b/static/redfish/v1/JsonSchemas/MessageRegistry/MessageRegistry.json
@@ -1,8 +1,8 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/MessageRegistry.v1_4_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MessageRegistry.v1_5_0.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",
+    "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -152,6 +152,16 @@
                     "longDescription": "This type shall contain the available actions for this resource.",
                     "versionAdded": "v1_2_0"
                 },
+                "Deprecated": {
+                    "description": "The reason the message has been deprecated.",
+                    "longDescription": "This property shall indicate that a message is deprecated.  The value of the string should explain the deprecation, including reference to new message or messages to be used.  The message can be supported in new and existing implementations, but usage in new implementations is discouraged.  Deprecated messages are likely to be removed in a future major version of the message registry.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
                 "Description": {
                     "description": "A short description of how and when to use this message.",
                     "longDescription": "This property shall indicate how and when this message is returned by the Redfish service.",
@@ -222,6 +232,28 @@
                     "readonly": true,
                     "type": "string",
                     "versionDeprecated": "v1_4_0"
+                },
+                "VersionAdded": {
+                    "description": "The registry version which added this message.",
+                    "longDescription": "This property shall contain the version of the message registry when the message was added.  This property shall not appear for messages created at version `1.0.0` of a message registry.",
+                    "pattern": "^\\d+\\.\\d+\\.\\d+$",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "VersionDeprecated": {
+                    "description": "The registry version when the the message was deprecated.",
+                    "longDescription": "This property shall contain the version of the registry when the message was deprecated.  This property shall not appear if the message has not been deprecated.",
+                    "pattern": "^\\d+\\.\\d+\\.\\d+$",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
                 }
             },
             "required": [
@@ -387,6 +419,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2020.1",
-    "title": "#MessageRegistry.v1_4_2.MessageRegistry"
+    "release": "2021.3",
+    "title": "#MessageRegistry.v1_5_0.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 8df9ecb..3324afa 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_2_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/MetricDefinition.v1_2_1.json",
     "$ref": "#/definitions/MetricDefinition",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -229,7 +229,7 @@
                             }
                         ]
                     },
-                    "longDescription": "This property shall list the metric properties that are part of a calculation.  This property should be present when the value of the ImplementationType property is `Synthesized or `Calculated`.",
+                    "longDescription": "This property shall list the metric properties that are part of a calculation.  This property should be present when the value of the ImplementationType property is `Synthesized` or `Calculated`.",
                     "type": "array"
                 },
                 "CalculationTimeInterval": {
@@ -538,5 +538,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2021.1",
-    "title": "#MetricDefinition.v1_2_0.MetricDefinition"
+    "title": "#MetricDefinition.v1_2_1.MetricDefinition"
 }
\ 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 077c8fb..99bf884 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_7_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/PCIeDevice.v1_8_0.json",
     "$ref": "#/definitions/PCIeDevice",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -329,6 +329,108 @@
             ],
             "type": "object"
         },
+        "PCIeErrors": {
+            "additionalProperties": false,
+            "description": "The PCIe errors associated with this device.",
+            "longDescription": "This property shall contain properties that describe the PCIe errors associated with this device.",
+            "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": {
+                "CorrectableErrorCount": {
+                    "description": "The total number of the PCIe correctable errors for this device.",
+                    "longDescription": "This property shall contain the total number of the PCIe correctable errors for this device.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
+                "FatalErrorCount": {
+                    "description": "The total number of the PCIe fatal errors for this device.",
+                    "longDescription": "This property shall contain the total number of the PCIe fatal errors for this device.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
+                "L0ToRecoveryCount": {
+                    "description": "The total number of times the PCIe link states transitioned from L0 to the recovery state for this device.",
+                    "longDescription": "This property shall contain the total number of times the PCIe link transitioned from L0 to the recovery state for this device.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
+                "NAKReceivedCount": {
+                    "description": "The total number of NAKs issued on the PCIe link by the receiver.",
+                    "longDescription": "This property shall contain the total number of NAKs issued on the PCIe link by the receiver.  A NAK is issued by the receiver when it detects that a TLP from this device was missed.  This could be because this device did not transmit it, or because the receiver could not properly decode the packet.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
+                "NAKSentCount": {
+                    "description": "The total number of NAKs issued on the PCIe link by this device.",
+                    "longDescription": "This property shall contain the total number of NAKs issued on the PCIe link by this device.  A NAK is issued by the device when it detects that a TLP from the receiver was missed.  This could be because the receiver did not transmit it, or because this device could not properly decode the packet.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
+                "NonFatalErrorCount": {
+                    "description": "The total number of the PCIe non-fatal errors for this device.",
+                    "longDescription": "This property shall contain the total number of the PCIe non-fatal errors for this device.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
+                "ReplayCount": {
+                    "description": "The total number of the PCIe replays issued by this device.",
+                    "longDescription": "This property shall contain the total number of the replays issued on the PCIe link by this device.  A replay is a retransmission of a TLP and occurs because the ACK timer is expired, which means that the receiver did not send the ACK or this device did not properly decode the ACK.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                },
+                "ReplayRolloverCount": {
+                    "description": "The total number of the PCIe replay rollovers issued by this device.",
+                    "longDescription": "This property shall contain the total number of the replay rollovers issued on the PCIe link by this device.  A replay rollover occurs when consecutive replays failed to resolve the errors on the link, which means that this device forced the link into the recovery state.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_8_0"
+                }
+            },
+            "type": "object"
+        },
         "PCIeInterface": {
             "additionalProperties": false,
             "description": "Properties that describe a PCIe interface.",
@@ -409,6 +511,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2021.1",
-    "title": "#PCIeDevice.v1_7_0.PCIeDevice"
+    "release": "2021.3",
+    "title": "#PCIeDevice.v1_8_0.PCIeDevice"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json b/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
index 64a88e5..473dd8e 100644
--- a/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
+++ b/static/redfish/v1/JsonSchemas/ServiceRoot/ServiceRoot.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ServiceRoot.v1_11_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ServiceRoot.v1_12_0.json",
     "$ref": "#/definitions/ServiceRoot",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -332,6 +332,13 @@
                     "readonly": true,
                     "versionAdded": "v1_11_0"
                 },
+                "LicenseService": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/LicenseService.json#/definitions/LicenseService",
+                    "description": "The link to the license service.",
+                    "longDescription": "This property shall contain a link to a resource of type LicenseService.",
+                    "readonly": true,
+                    "versionAdded": "v1_12_0"
+                },
                 "Links": {
                     "$ref": "#/definitions/Links",
                     "description": "The links to other Resources that are related to this Resource.",
@@ -490,6 +497,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2021.2",
-    "title": "#ServiceRoot.v1_11_0.ServiceRoot"
+    "release": "2021.3",
+    "title": "#ServiceRoot.v1_12_0.ServiceRoot"
 }
\ 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 f5be46d..a001ea8 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_3_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/StorageController.v1_4_0.json",
     "$ref": "#/definitions/StorageController",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2021 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -371,6 +371,26 @@
                     "longDescription": "This property shall contain the ANA characteristics and volume information.",
                     "type": "array"
                 },
+                "AllocatedCompletionQueues": {
+                    "description": "The number of I/O completion queues allocated to this NVMe I/O controller.",
+                    "longDescription": "This property shall contain the number of I/O completion queues allocated to this NVMe I/O controller.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
+                "AllocatedSubmissionQueues": {
+                    "description": "The number of I/O submission queues allocated to this NVMe I/O controller.",
+                    "longDescription": "This property shall contain the number of I/O submission queues allocated to this NVMe I/O controller.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
                 "ControllerType": {
                     "anyOf": [
                         {
@@ -842,6 +862,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2021.2",
-    "title": "#StorageController.v1_3_0.StorageController"
+    "release": "2021.3",
+    "title": "#StorageController.v1_4_0.StorageController"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/schema/Certificate_v1.xml b/static/redfish/v1/schema/Certificate_v1.xml
index 8caa05d..b0fc804 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.4.0                                                  -->
+<!--# Redfish Schema:  Certificate 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                                   -->
@@ -529,7 +529,7 @@
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
       </ComplexType>
-      
+
       <EnumType Name="CertificateUsageType">
         <Member Name="User">
           <Annotation Term="OData.Description" String="This certificate is a user certificate like those associated with a manager account."/>
@@ -552,5 +552,28 @@
       </EnumType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Certificate.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2021.3"/>
+
+      <EntityType Name="Certificate" BaseType="Certificate.v1_4_0.Certificate">
+        <Property Name="SPDM" Type="Certificate.v1_5_0.SPDM">
+          <Annotation Term="OData.Description" String="SPDM-related information for the certificate."/>
+          <Annotation Term="OData.LongDescription" String="The value of this property shall contain SPDM-related information for the certificate.  This property shall only be present for SPDM certificates."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="SPDM">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="SPDM-related information for a certificate."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain contain SPDM-related information for a certificate."/>
+        <Property Name="SlotId" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Slot identifier of the certificate."/>
+          <Annotation Term="OData.LongDescription" String="The value of this property shall contain an integer between 0 and 7, inclusive, that represents the slot identifier for an SPDM-provided certificate."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Chassis_v1.xml b/static/redfish/v1/schema/Chassis_v1.xml
index 0ea631b..824c4af 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.17.0                                                     -->
+<!--# Redfish Schema:  Chassis v1.18.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -112,6 +112,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Cable_v1.xml">
     <edmx:Include Namespace="Cable"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Outlet_v1.xml">
+    <edmx:Include Namespace="Outlet"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -1590,5 +1593,33 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Chassis.v1_18_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2021.3"/>
+
+      <EntityType Name="Chassis" BaseType="Chassis.v1_17_0.Chassis">
+        <Property Name="ElectricalSourceManagerURIs" Type="Collection(Edm.String)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The URIs of the management interfaces for the upstream electrical source connections for this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of URIs to the management applications or devices that provide monitoring or control of the upstream electrical sources that provide power to this chassis."/>
+          <Annotation Term="OData.IsURL"/>
+        </Property>
+        <Property Name="ElectricalSourceNames" Type="Collection(Edm.String)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The names of the upstream electrical sources, such as circuits or outlets, connected to this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an arrays of strings that identify the upstream electrical sources, such as the names of circuits or outlets, that provide power to this chassis."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Links" BaseType="Chassis.v1_17_0.Links">
+        <NavigationProperty Name="PowerOutlets" Type="Collection(Outlet.Outlet)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An array of links to the outlets that provide power to this chassis."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to resources of type Outlet that represent the outlets that provide power to this chassis."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ComputerSystem_v1.xml b/static/redfish/v1/schema/ComputerSystem_v1.xml
index 8c05e5a..c3e68df 100644
--- a/static/redfish/v1/schema/ComputerSystem_v1.xml
+++ b/static/redfish/v1/schema/ComputerSystem_v1.xml
@@ -1411,7 +1411,7 @@
         </Property>
         <Property Name="BootOrder" Type="Collection(Edm.String)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
-          <Annotation Term="OData.Description" String="An array of BootOptionReference strings that represent the persistent boot order for with this computer system."/>
+          <Annotation Term="OData.Description" String="An array of BootOptionReference strings that represent the persistent boot order for with this computer system.  Changes to the boot order typically require a system reset before they take effect.  It is likely that a client finds the `@Redfish.Settings` term in this resource, and if it is found, the client makes requests to change boot order settings by modifying the resource identified by the `@Redfish.Settings` term."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain an array of BootOptionReference strings that represent the persistent boot order for this computer system.  For UEFI systems, this is the UEFI Specification-defined UEFI BootOrder."/>
         </Property>
       </ComplexType>
@@ -1573,6 +1573,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_9.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_5_11">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_5_10.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"/>
@@ -1670,6 +1676,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_7.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_6_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_6_8.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"/>
@@ -1736,6 +1748,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_6.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_7_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_7_7.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"/>
@@ -1787,6 +1805,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_5.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_8_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_6.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"/>
@@ -1839,6 +1863,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_5.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_9_6.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"/>
@@ -1884,6 +1914,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_10_4.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_10_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_10_5.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"/>
@@ -1951,6 +1987,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_3.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_11_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_11_4.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"/>
@@ -1983,6 +2025,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_12_2.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_12_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_12_3.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"/>
@@ -2236,6 +2284,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_1.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_13_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_13_2.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"/>
@@ -2289,6 +2343,12 @@
       <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_14_0.ComputerSystem"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_14_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_14_1.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_15_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -2369,6 +2429,12 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_15_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_15_0.ComputerSystem"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_16_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -2467,5 +2533,11 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_16_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the BootOrder property might be controlled with a settings resource."/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_16_0.ComputerSystem"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/EventDestination_v1.xml b/static/redfish/v1/schema/EventDestination_v1.xml
index 7f194b3..d04cfd4 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.11.0                                            -->
+<!--# Redfish Schema:  EventDestination v1.11.1                                            -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -102,7 +102,7 @@
           <Annotation Term="Redfish.RequiredOnCreate"/>
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The URI of the destination event receiver."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain a URI to the destination where the events are sent.  If Protocol is `SMTP`, the URI shall follow the RFC6068-described format.  SNMP URIs shall be consistent with RFC4088.  Specifically, for SNMPv3, if a username is specified in the SNMP URI, the SNMPv3 authentication and encryption configuration associated with that user shall be utilized in the SNMPv3 traps.  Syslog URIs shall be consistent with RFC3986 and contain the scheme `syslog://`.  For other URIs, such as HTTP or HTTPS, they shall be consistent with RFC3986."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a URI to the destination where the events are sent.  If Protocol is `SMTP`, the URI shall follow the RFC6068-described format.  SNMP URIs shall be consistent with RFC4088.  Specifically, for SNMPv3, if a username is specified in the SNMP URI, the SNMPv3 authentication and encryption configuration associated with that user shall be utilized in the SNMPv3 traps.  Syslog URIs shall be consistent with RFC3986 and contain the scheme `syslog://`.  Server-sent event destinations shall be in the form `redfish-sse://ip:port` where `ip` and `port` are the IP address and the port of the client with the open SSE connection.  For other URIs, such as HTTP or HTTPS, they shall be consistent with RFC3986."/>
           <Annotation Term="OData.IsURL"/>
         </Property>
         <Property Name="EventTypes" Type="Collection(Event.EventType)" Nullable="false">
@@ -265,7 +265,6 @@
           </Collection>
         </Annotation>
       </ComplexType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_0_2">
@@ -316,9 +315,16 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_0_8.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_0_9.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"/>
+
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_0_2.EventDestination">
         <NavigationProperty Name="OriginResources" Type="Collection(Resource.ItemOrCollection)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -381,9 +387,16 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_1_7.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_1_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_1_8.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"/>
+
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_1_2.EventDestination">
         <Property Name="Actions" Type="EventDestination.v1_2_0.Actions" Nullable="false">
           <Annotation Term="OData.Description" String="The available actions for this Resource."/>
@@ -444,9 +457,16 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_2_5.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_2_7">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_2_6.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"/>
+
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_2_2.EventDestination">
         <Property Name="SubscriptionType" Type="EventDestination.v1_3_0.SubscriptionType">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -461,7 +481,7 @@
           <Annotation Term="OData.Description" String="The subscription follows the Redfish Specification for event notifications.  To send an event notification, a service sends an HTTP POST to the subscriber's destination URI."/>
         </Member>
         <Member Name="SSE">
-          <Annotation Term="OData.Description" String="The subscription follows the HTML5 Server-Sent Event definition for event notifications."/>
+          <Annotation Term="OData.Description" String="The subscription follows the HTML5 server-sent event definition for event notifications."/>
         </Member>
         <Member Name="SNMPTrap">
           <Annotation Term="OData.Description" String="The subscription follows the various versions of SNMP Traps for event notifications."/>
@@ -538,10 +558,17 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_3_3.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_3_4.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"/>
       <Annotation Term="OData.Description" String="This version was created to add the RegistryPrefix, ResourceType and SubordinateResources method of eventing."/>
+
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_3_0.EventDestination">
         <Property Name="RegistryPrefixes" Type="Collection(Edm.String)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -584,10 +611,17 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_4_2.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_4_3.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"/>
       <Annotation Term="OData.Description" String="This version was created to deprecate the EventTypes property."/>
+
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_4_1.EventDestination"/>
     </Schema>
 
@@ -603,6 +637,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_5_1.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_5_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_5_2.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"/>
@@ -671,6 +711,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_6_2.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_6_3.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"/>
@@ -817,6 +863,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_7_2.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_7_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_7_3.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"/>
@@ -849,6 +901,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_8_2.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_8_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_8_3.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"/>
@@ -1025,6 +1083,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_2.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_9_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_9_3.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."/>
@@ -1058,6 +1122,12 @@
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_10_1.EventDestination"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_10_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_10_2.EventDestination"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_11_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.2"/>
@@ -1084,5 +1154,11 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventDestination.v1_11_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to clarify the usage of the Destination property with server-sent events."/>
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_11_0.EventDestination"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/LogEntry_v1.xml b/static/redfish/v1/schema/LogEntry_v1.xml
index 6f3fee6..7305253 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.9.0                                                     -->
+<!--# Redfish Schema:  LogEntry 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                                   -->
@@ -1135,6 +1135,30 @@
         <Member Name="OEM">
           <Annotation Term="OData.Description" String="OEM diagnostic data."/>
         </Member>
+        <Member Name="CPER">
+          <Annotation Term="OData.Description" String="UEFI Common Platform Error Record."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the data provided at the URI specified by the AdditionalDataURI property is a complete UEFI Specification-defined Common Platform Error Record.  The CPER data shall contain a Record Header and at least one Section as defined by the UEFI Specification."/>
+          <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="CPERSection">
+          <Annotation Term="OData.Description" String="A Section of a UEFI Common Platform Error Record."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the data provided at the URI specified by the AdditionalDataURI property is a single Section of a UEFI Specification-defined Common Platform Error Record.  The CPER data shall contain one Section as defined by the UEFI Specification, with no Record Header."/>
+          <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>
 
@@ -1177,5 +1201,13 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_10_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2021.3"/>
+      <Annotation Term="OData.Description" String="This version was created add `CPER` and `CPERSection` to LogDiagnosticDataTypes."/>
+
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_9_0.LogEntry"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ManagerAccount_v1.xml b/static/redfish/v1/schema/ManagerAccount_v1.xml
index 276d0b2..dcdc475 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.8.0                                               -->
+<!--# Redfish Schema:  ManagerAccount v1.8.1                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -39,7 +39,7 @@
 
       <EntityType Name="ManagerAccount" BaseType="Resource.v1_0_0.Resource" Abstract="true">
         <Annotation Term="OData.Description" String="The ManagerAccount schema defines the user accounts that are owned by a manager.  Changes to a manager account might affect the current Redfish service connection if this manager is responsible for the Redfish service."/>
-        <Annotation Term="OData.LongDescription" String="This resource shall represent a user account for the manager in a Redfish implementation."/>
+        <Annotation Term="OData.LongDescription" String="This resource shall represent a user account for the manager in a Redfish implementation.  The account shall indicate the allowed access to one of more services in the manager."/>
         <Annotation Term="Capabilities.InsertRestrictions">
           <Record>
             <PropertyValue Property="Insertable" Bool="false"/>
@@ -446,8 +446,8 @@
         </Property>
         <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 that contains the value `Redfish`.  The service may add additional values when this property is set or updated if allowed by the value of the StrictAccountTypes property."/>
+          <Annotation Term="OData.Description" String="The list of services in the manager that the account is allowed to access."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the various manager services that the account is allowed to access.  This shall not include functionality for receiving events or other notifications.  If this property is not provided by the client, the default value shall be an array that contains the value `Redfish`.  The service may 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)">
@@ -594,6 +594,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_4_4.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_4_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions of the resource and the AccountTypes property to clarify intended usage."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_4_5.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.4"/>
@@ -638,6 +644,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_5_3.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_5_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions of the resource and the AccountTypes property to clarify intended usage."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_5_4.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_6_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.1"/>
@@ -670,6 +682,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_6_2.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_6_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions of the resource and the AccountTypes property to clarify intended usage."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_6_3.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."/>
@@ -690,6 +708,12 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_7_0.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_7_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions of the resource and the AccountTypes property to clarify intended usage."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_7_1.ManagerAccount"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_8_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -709,5 +733,11 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_8_1">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the descriptions of the resource and the AccountTypes property to clarify intended usage."/>
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_8_0.ManagerAccount"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/MessageRegistry_v1.xml b/static/redfish/v1/schema/MessageRegistry_v1.xml
index b3fd6b2..0784c90 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.2                                              -->
+<!--# Redfish Schema:  MessageRegistry 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                                   -->
@@ -425,5 +425,33 @@
       <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_4_1.MessageRegistry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MessageRegistry.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2021.3"/>
+      <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."/>
+
+      <EntityType Name="MessageRegistry" BaseType="MessageRegistry.v1_4_2.MessageRegistry"/>
+
+      <ComplexType Name="Message" BaseType="MessageRegistry.v1_4_0.Message">
+        <Property Name="VersionAdded" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Validation.Pattern" String="^\d+\.\d+\.\d+$"/>
+          <Annotation Term="OData.Description" String="The registry version which added this message."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the version of the message registry when the message was added.  This property shall not appear for messages created at version `1.0.0` of a message registry."/>
+        </Property>
+        <Property Name="Deprecated" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The reason the message has been deprecated."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate that a message is deprecated.  The value of the string should explain the deprecation, including reference to new message or messages to be used.  The message can be supported in new and existing implementations, but usage in new implementations is discouraged.  Deprecated messages are likely to be removed in a future major version of the message registry."/>
+        </Property>
+        <Property Name="VersionDeprecated" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="Validation.Pattern" String="^\d+\.\d+\.\d+$"/>
+          <Annotation Term="OData.Description" String="The registry version when the the message was deprecated."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the version of the registry when the message was deprecated.  This property shall not appear if the message has not been deprecated."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/MetricDefinition_v1.xml b/static/redfish/v1/schema/MetricDefinition_v1.xml
index f3c1394..0d47bc1 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.2.0                                             -->
+<!--# Redfish Schema:  MetricDefinition 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                                   -->
@@ -192,7 +192,7 @@
 
         <Property Name="CalculationParameters" Type="Collection(MetricDefinition.v1_0_0.CalculationParamsType)">
           <Annotation Term="OData.Description" String="The metric properties that are part of a calculation."/>
-          <Annotation Term="OData.LongDescription" String="This property shall list the metric properties that are part of a calculation.  This property should be present when the value of the ImplementationType property is `Synthesized or `Calculated`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall list the metric properties that are part of a calculation.  This property should be present when the value of the ImplementationType property is `Synthesized` or `Calculated`."/>
         </Property>
 
         <Property Name="PhysicalContext" Type="PhysicalContext.PhysicalContext">
@@ -375,6 +375,12 @@
       <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_0_6.MetricDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.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="MetricDefinition" BaseType="MetricDefinition.v1_0_7.MetricDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2020.3"/>
@@ -401,6 +407,12 @@
       <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_1_1.MetricDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.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="MetricDefinition" BaseType="MetricDefinition.v1_1_2.MetricDefinition"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2021.1"/>
@@ -409,5 +421,11 @@
       <EntityType Name="MetricDefinition" BaseType="MetricDefinition.v1_1_2.MetricDefinition"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MetricDefinition.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="MetricDefinition" BaseType="MetricDefinition.v1_2_0.MetricDefinition"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/PCIeDevice_v1.xml b/static/redfish/v1/schema/PCIeDevice_v1.xml
index 2dbc2d7..36b9fa6 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.7.0                                                   -->
+<!--# Redfish Schema:  PCIeDevice 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                                   -->
@@ -81,6 +81,12 @@
         <Annotation Term="OData.LongDescription" String="This type shall describe the PCIe interface characteristics of a PCIe device."/>
       </ComplexType>
 
+      <ComplexType Name="PCIeErrors" Abstract="true">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The PCIe errors associated with this device."/>
+        <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the PCIe errors associated with this device."/>
+      </ComplexType>
+
       <EnumType Name="PCIeTypes">
         <Annotation Term="Redfish.Revisions">
           <Collection>
@@ -471,5 +477,55 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="PCIeDevice.v1_8_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2021.3"/>
+
+      <EntityType Name="PCIeDevice" BaseType="PCIeDevice.v1_7_0.PCIeDevice"/>
+
+      <ComplexType Name="PCIeErrors" BaseType="PCIeDevice.PCIeErrors">
+        <Property Name="CorrectableErrorCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of the PCIe correctable errors for this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of the PCIe correctable errors for this device."/>
+        </Property>
+        <Property Name="NonFatalErrorCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of the PCIe non-fatal errors for this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of the PCIe non-fatal errors for this device."/>
+        </Property>
+        <Property Name="FatalErrorCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of the PCIe fatal errors for this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of the PCIe fatal errors for this device."/>
+        </Property>
+        <Property Name="L0ToRecoveryCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of times the PCIe link states transitioned from L0 to the recovery state for this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of times the PCIe link transitioned from L0 to the recovery state for this device."/>
+        </Property>
+        <Property Name="ReplayCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of the PCIe replays issued by this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of the replays issued on the PCIe link by this device.  A replay is a retransmission of a TLP and occurs because the ACK timer is expired, which means that the receiver did not send the ACK or this device did not properly decode the ACK."/>
+        </Property>
+        <Property Name="ReplayRolloverCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of the PCIe replay rollovers issued by this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of the replay rollovers issued on the PCIe link by this device.  A replay rollover occurs when consecutive replays failed to resolve the errors on the link, which means that this device forced the link into the recovery state."/>
+        </Property>
+        <Property Name="NAKSentCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of NAKs issued on the PCIe link by this device."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of NAKs issued on the PCIe link by this device.  A NAK is issued by the device when it detects that a TLP from the receiver was missed.  This could be because the receiver did not transmit it, or because this device could not properly decode the packet."/>
+        </Property>
+        <Property Name="NAKReceivedCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The total number of NAKs issued on the PCIe link by the receiver."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the total number of NAKs issued on the PCIe link by the receiver.  A NAK is issued by the receiver when it detects that a TLP from this device was missed.  This could be because this device did not transmit it, or because the receiver could not properly decode the packet."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ServiceRoot_v1.xml b/static/redfish/v1/schema/ServiceRoot_v1.xml
index 72fcd2a..1be074b 100644
--- a/static/redfish/v1/schema/ServiceRoot_v1.xml
+++ b/static/redfish/v1/schema/ServiceRoot_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ServiceRoot v1.11.0                                                 -->
+<!--# Redfish Schema:  ServiceRoot 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                                   -->
@@ -94,6 +94,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/StorageCollection_v1.xml">
     <edmx:Include Namespace="StorageCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/LicenseService_v1.xml">
+    <edmx:Include Namespace="LicenseService"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/NVMeDomainCollection_v1.xml">
     <edmx:Include Namespace="NVMeDomainCollection"/>
   </edmx:Reference>
@@ -742,5 +745,23 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ServiceRoot.v1_12_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2021.3"/>
+
+      <EntityContainer Name="ServiceContainer" Extends="ServiceRoot.v1_11_0.ServiceContainer">
+        <Singleton Name="LicenseService" Type="LicenseService.LicenseService"/>
+      </EntityContainer>
+
+      <EntityType Name="ServiceRoot" BaseType="ServiceRoot.v1_11_0.ServiceRoot">
+        <NavigationProperty Name="LicenseService" Type="LicenseService.LicenseService" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The link to the license service."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a resource of type LicenseService."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/StorageController_v1.xml b/static/redfish/v1/schema/StorageController_v1.xml
index 13e670d..6554208 100644
--- a/static/redfish/v1/schema/StorageController_v1.xml
+++ b/static/redfish/v1/schema/StorageController_v1.xml
@@ -541,5 +541,25 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="StorageController.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2021.3"/>
+
+      <EntityType Name="StorageController" BaseType="StorageController.v1_3_0.StorageController"/>
+
+      <ComplexType Name="NVMeControllerProperties" BaseType="StorageController.v1_0_0.NVMeControllerProperties">
+        <Property Name="AllocatedSubmissionQueues" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of I/O submission queues allocated to this NVMe I/O controller."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of I/O submission queues allocated to this NVMe I/O controller."/>
+        </Property>
+        <Property Name="AllocatedCompletionQueues" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The number of I/O completion queues allocated to this NVMe I/O controller."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the number of I/O completion queues allocated to this NVMe I/O controller."/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>