diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py
index 01ab66c..3e8529b 100755
--- a/scripts/update_schemas.py
+++ b/scripts/update_schemas.py
@@ -12,7 +12,7 @@
 
 import xml.etree.ElementTree as ET
 
-VERSION = "DSP8010_2019.2"
+VERSION = "DSP8010_2019.3"
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
@@ -65,12 +65,8 @@
 
     for zip_filepath in zip_ref.namelist():
         if zip_filepath.startswith(VERSION +
-                                   '/' +
-                                   VERSION +
                                    '/csdl/') & (zip_filepath != VERSION +
                                                 "/csdl/") & (zip_filepath != VERSION +
-                                                             '/' +
-                                                             VERSION +
                                                              "/csdl/"):
             filename = os.path.basename(zip_filepath)
             with open(os.path.join(schema_path, filename), 'wb') as schema_file:
@@ -141,7 +137,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(VERSION, 'json-schema/')):
         filename = os.path.basename(zip_filepath)
         filenamesplit = filename.split(".")
         if len(filenamesplit) == 3:
@@ -157,7 +153,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(VERSION, "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 2a88ba5..75db819 100644
--- a/static/redfish/v1/$metadata/index.xml
+++ b/static/redfish/v1/$metadata/index.xml
@@ -299,6 +299,7 @@
         <edmx:Include Namespace="ComputerSystem.v1_7_0"/>
         <edmx:Include Namespace="ComputerSystem.v1_7_1"/>
         <edmx:Include Namespace="ComputerSystem.v1_8_0"/>
+        <edmx:Include Namespace="ComputerSystem.v1_9_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ComputerSystemCollection_v1.xml">
         <edmx:Include Namespace="ComputerSystemCollection"/>
@@ -345,6 +346,7 @@
         <edmx:Include Namespace="Drive.v1_6_0"/>
         <edmx:Include Namespace="Drive.v1_6_1"/>
         <edmx:Include Namespace="Drive.v1_7_0"/>
+        <edmx:Include Namespace="Drive.v1_8_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Endpoint_v1.xml">
         <edmx:Include Namespace="Endpoint"/>
@@ -478,6 +480,7 @@
         <edmx:Include Namespace="EventDestination.v1_5_0"/>
         <edmx:Include Namespace="EventDestination.v1_5_1"/>
         <edmx:Include Namespace="EventDestination.v1_6_0"/>
+        <edmx:Include Namespace="EventDestination.v1_7_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/EventDestinationCollection_v1.xml">
         <edmx:Include Namespace="EventDestinationCollection"/>
@@ -504,6 +507,7 @@
         <edmx:Include Namespace="EventService.v1_3_0"/>
         <edmx:Include Namespace="EventService.v1_3_1"/>
         <edmx:Include Namespace="EventService.v1_4_0"/>
+        <edmx:Include Namespace="EventService.v1_5_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ExternalAccountProvider_v1.xml">
         <edmx:Include Namespace="ExternalAccountProvider"/>
@@ -611,6 +615,7 @@
         <edmx:Include Namespace="LogEntry.v1_0_7"/>
         <edmx:Include Namespace="LogEntry.v1_0_8"/>
         <edmx:Include Namespace="LogEntry.v1_0_9"/>
+        <edmx:Include Namespace="LogEntry.v1_0_10"/>
         <edmx:Include Namespace="LogEntry.v1_1_0"/>
         <edmx:Include Namespace="LogEntry.v1_1_1"/>
         <edmx:Include Namespace="LogEntry.v1_1_2"/>
@@ -619,21 +624,26 @@
         <edmx:Include Namespace="LogEntry.v1_1_5"/>
         <edmx:Include Namespace="LogEntry.v1_1_6"/>
         <edmx:Include Namespace="LogEntry.v1_1_7"/>
+        <edmx:Include Namespace="LogEntry.v1_1_8"/>
         <edmx:Include Namespace="LogEntry.v1_2_0"/>
         <edmx:Include Namespace="LogEntry.v1_2_1"/>
         <edmx:Include Namespace="LogEntry.v1_2_2"/>
         <edmx:Include Namespace="LogEntry.v1_2_3"/>
         <edmx:Include Namespace="LogEntry.v1_2_4"/>
         <edmx:Include Namespace="LogEntry.v1_2_5"/>
+        <edmx:Include Namespace="LogEntry.v1_2_6"/>
         <edmx:Include Namespace="LogEntry.v1_3_0"/>
         <edmx:Include Namespace="LogEntry.v1_3_1"/>
         <edmx:Include Namespace="LogEntry.v1_3_2"/>
         <edmx:Include Namespace="LogEntry.v1_3_3"/>
         <edmx:Include Namespace="LogEntry.v1_3_4"/>
+        <edmx:Include Namespace="LogEntry.v1_3_5"/>
         <edmx:Include Namespace="LogEntry.v1_4_0"/>
         <edmx:Include Namespace="LogEntry.v1_4_1"/>
         <edmx:Include Namespace="LogEntry.v1_4_2"/>
         <edmx:Include Namespace="LogEntry.v1_4_3"/>
+        <edmx:Include Namespace="LogEntry.v1_4_4"/>
+        <edmx:Include Namespace="LogEntry.v1_5_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/LogEntryCollection_v1.xml">
         <edmx:Include Namespace="LogEntryCollection"/>
@@ -728,6 +738,7 @@
         <edmx:Include Namespace="ManagerAccount.v1_2_2"/>
         <edmx:Include Namespace="ManagerAccount.v1_3_0"/>
         <edmx:Include Namespace="ManagerAccount.v1_3_1"/>
+        <edmx:Include Namespace="ManagerAccount.v1_4_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ManagerAccountCollection_v1.xml">
         <edmx:Include Namespace="ManagerAccountCollection"/>
@@ -759,6 +770,7 @@
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_4_0"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_4_1"/>
         <edmx:Include Namespace="ManagerNetworkProtocol.v1_4_2"/>
+        <edmx:Include Namespace="ManagerNetworkProtocol.v1_5_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/Memory_v1.xml">
         <edmx:Include Namespace="Memory"/>
@@ -1171,6 +1183,7 @@
         <edmx:Include Namespace="Power.v1_5_2"/>
         <edmx:Include Namespace="Power.v1_5_3"/>
         <edmx:Include Namespace="Power.v1_5_4"/>
+        <edmx:Include Namespace="Power.v1_6_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/PrivilegeRegistry_v1.xml">
         <edmx:Include Namespace="PrivilegeRegistry"/>
@@ -1204,26 +1217,33 @@
         <edmx:Include Namespace="Processor.v1_0_6"/>
         <edmx:Include Namespace="Processor.v1_0_7"/>
         <edmx:Include Namespace="Processor.v1_0_8"/>
+        <edmx:Include Namespace="Processor.v1_0_9"/>
         <edmx:Include Namespace="Processor.v1_1_0"/>
         <edmx:Include Namespace="Processor.v1_1_1"/>
         <edmx:Include Namespace="Processor.v1_1_2"/>
         <edmx:Include Namespace="Processor.v1_1_3"/>
         <edmx:Include Namespace="Processor.v1_1_4"/>
+        <edmx:Include Namespace="Processor.v1_1_5"/>
         <edmx:Include Namespace="Processor.v1_2_0"/>
         <edmx:Include Namespace="Processor.v1_2_1"/>
         <edmx:Include Namespace="Processor.v1_2_2"/>
         <edmx:Include Namespace="Processor.v1_2_3"/>
         <edmx:Include Namespace="Processor.v1_2_4"/>
+        <edmx:Include Namespace="Processor.v1_2_5"/>
         <edmx:Include Namespace="Processor.v1_3_0"/>
         <edmx:Include Namespace="Processor.v1_3_1"/>
         <edmx:Include Namespace="Processor.v1_3_2"/>
         <edmx:Include Namespace="Processor.v1_3_3"/>
         <edmx:Include Namespace="Processor.v1_3_4"/>
+        <edmx:Include Namespace="Processor.v1_3_5"/>
         <edmx:Include Namespace="Processor.v1_4_0"/>
         <edmx:Include Namespace="Processor.v1_4_1"/>
         <edmx:Include Namespace="Processor.v1_4_2"/>
+        <edmx:Include Namespace="Processor.v1_4_3"/>
         <edmx:Include Namespace="Processor.v1_5_0"/>
         <edmx:Include Namespace="Processor.v1_5_1"/>
+        <edmx:Include Namespace="Processor.v1_5_2"/>
+        <edmx:Include Namespace="Processor.v1_6_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ProcessorCollection_v1.xml">
         <edmx:Include Namespace="ProcessorCollection"/>
@@ -1336,6 +1356,7 @@
         <edmx:Include Namespace="Resource.v1_8_0"/>
         <edmx:Include Namespace="Resource.v1_8_1"/>
         <edmx:Include Namespace="Resource.v1_8_2"/>
+        <edmx:Include Namespace="Resource.v1_8_3"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/ResourceBlock_v1.xml">
         <edmx:Include Namespace="ResourceBlock"/>
@@ -1406,6 +1427,7 @@
         <edmx:Include Namespace="Sensor.v1_0_0"/>
         <edmx:Include Namespace="Sensor.v1_0_1"/>
         <edmx:Include Namespace="Sensor.v1_0_2"/>
+        <edmx:Include Namespace="Sensor.v1_0_3"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/SensorCollection_v1.xml">
         <edmx:Include Namespace="SensorCollection"/>
@@ -1516,6 +1538,7 @@
         <edmx:Include Namespace="Settings.v1_2_0"/>
         <edmx:Include Namespace="Settings.v1_2_1"/>
         <edmx:Include Namespace="Settings.v1_2_2"/>
+        <edmx:Include Namespace="Settings.v1_3_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/SimpleStorage_v1.xml">
         <edmx:Include Namespace="SimpleStorage"/>
@@ -1606,6 +1629,7 @@
         <edmx:Include Namespace="Storage.v1_6_2"/>
         <edmx:Include Namespace="Storage.v1_7_0"/>
         <edmx:Include Namespace="Storage.v1_7_1"/>
+        <edmx:Include Namespace="Storage.v1_8_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/StorageCollection_v1.xml">
         <edmx:Include Namespace="StorageCollection"/>
@@ -1776,6 +1800,7 @@
         <edmx:Include Namespace="UpdateService.v1_5_0"/>
         <edmx:Include Namespace="UpdateService.v1_5_1"/>
         <edmx:Include Namespace="UpdateService.v1_6_0"/>
+        <edmx:Include Namespace="UpdateService.v1_7_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/VirtualMedia_v1.xml">
         <edmx:Include Namespace="VirtualMedia"/>
@@ -1835,11 +1860,15 @@
         <edmx:Include Namespace="Volume.v1_1_1"/>
         <edmx:Include Namespace="Volume.v1_1_2"/>
         <edmx:Include Namespace="Volume.v1_1_3"/>
+        <edmx:Include Namespace="Volume.v1_1_4"/>
         <edmx:Include Namespace="Volume.v1_2_0"/>
         <edmx:Include Namespace="Volume.v1_2_1"/>
         <edmx:Include Namespace="Volume.v1_2_2"/>
+        <edmx:Include Namespace="Volume.v1_2_3"/>
         <edmx:Include Namespace="Volume.v1_3_0"/>
         <edmx:Include Namespace="Volume.v1_3_1"/>
+        <edmx:Include Namespace="Volume.v1_3_2"/>
+        <edmx:Include Namespace="Volume.v1_4_0"/>
     </edmx:Reference>
     <edmx:Reference Uri="/redfish/v1/schema/VolumeCollection_v1.xml">
         <edmx:Include Namespace="VolumeCollection"/>
diff --git a/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json b/static/redfish/v1/JsonSchemas/ComputerSystem/ComputerSystem.json
index 9c8f952..99c74d9 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_8_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.v1_9_0.json",
     "$ref": "#/definitions/ComputerSystem",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -220,6 +220,17 @@
                     "readonly": true,
                     "versionAdded": "v1_7_0"
                 },
+                "HttpBootUri": {
+                    "description": "The URI to boot from when BootSourceOverrideTarget is set to `UefiHttp`.",
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain the URI to perform an HTTP or HTTPS boot when BootSourceOverrideTarget is set to `UefiHttp`.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_9_0"
+                },
                 "UefiTargetBootSourceOverride": {
                     "description": "The UEFI device path of the device from which to boot when BootSourceOverrideTarget is `UefiTarget`.",
                     "longDescription": "This property shall contain the UEFI device path of the override boot target.  The Redfish.AllowableValues annotation specifies the values for this property.  The `Continuous` value is not supported for the BootSourceOverrideEnabled property for UEFI boot source override because UEFI supports one-time boot only.  Changes to this property do not alter the BIOS persistent boot order configuration.",
@@ -1414,6 +1425,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.2",
-    "title": "#ComputerSystem.v1_8_0.ComputerSystem"
+    "release": "2019.3",
+    "title": "#ComputerSystem.v1_9_0.ComputerSystem"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Drive/Drive.json b/static/redfish/v1/JsonSchemas/Drive/Drive.json
index a3fb11c..7ff65b5 100644
--- a/static/redfish/v1/JsonSchemas/Drive/Drive.json
+++ b/static/redfish/v1/JsonSchemas/Drive/Drive.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_7_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Drive.v1_8_0.json",
     "$ref": "#/definitions/Drive",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -524,6 +524,19 @@
                 "PCIeFunctions@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
+                "StoragePools": {
+                    "description": "An array of links to the storage pools to which this drive belongs.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StoragePool.json#/definitions/StoragePool"
+                    },
+                    "longDescription": "This property shall contain an array of links of type StoragePool to which this drive belongs.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_8_0"
+                },
+                "StoragePools@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
+                },
                 "Volumes": {
                     "description": "An array of links to the volumes that this drive either wholly or only partially contains.",
                     "items": {
@@ -717,6 +730,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.2",
-    "title": "#Drive.v1_7_0.Drive"
+    "release": "2019.3",
+    "title": "#Drive.v1_8_0.Drive"
 }
\ 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 821b284..a029fea 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_6_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EventDestination.v1_7_0.json",
     "$ref": "#/definitions/EventDestination",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -122,7 +122,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.",
+                    "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.  For other URIs, such as HTTP or HTTPS, they shall be consistent with RFC3986.",
                     "readonly": true,
                     "type": "string"
                 },
@@ -243,6 +243,12 @@
                     "type": "array",
                     "versionAdded": "v1_4_0"
                 },
+                "SNMP": {
+                    "$ref": "#/definitions/SNMPSettings",
+                    "description": "Settings for an SNMP event destination.",
+                    "longDescription": "This property shall contain the settings for an SNMP event destination.",
+                    "versionAdded": "v1_7_0"
+                },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
                     "description": "This property shall contain the status of the subscription.",
@@ -290,17 +296,37 @@
         },
         "EventDestinationProtocol": {
             "enum": [
-                "Redfish"
+                "Redfish",
+                "SNMPv1",
+                "SNMPv2c",
+                "SNMPv3",
+                "SMTP"
             ],
             "enumDescriptions": {
-                "Redfish": "The destination follows the Redfish Specification for event notifications."
+                "Redfish": "The destination follows the Redfish Specification for event notifications.",
+                "SMTP": "The destination follows the SMTP specification for event notifications.",
+                "SNMPv1": "The destination follows the SNMPv1 protocol for event notifications.",
+                "SNMPv2c": "The destination follows the SNMPv2c protocol for event notifications.",
+                "SNMPv3": "The destination follows the SNMPv3 protocol for event notifications."
+            },
+            "enumLongDescriptions": {
+                "SMTP": "This value shall indicate the destination follows the RFC5321-defined SMTP specification.",
+                "SNMPv1": "This value shall indicate the destination follows the RFC1157-defined SNMPv1 protocol.",
+                "SNMPv2c": "This value shall indicate the destination follows the SNMPv2c protocol as defined by RFC1441 and RFC1452.",
+                "SNMPv3": "This value shall indicate the destination follows the SNMPv3 protocol as defined by RFC3411 and RFC3418."
+            },
+            "enumVersionAdded": {
+                "SMTP": "v1_7_0",
+                "SNMPv1": "v1_7_0",
+                "SNMPv2c": "v1_7_0",
+                "SNMPv3": "v1_7_0"
             },
             "type": "string"
         },
         "HttpHeaderProperty": {
             "additionalProperties": false,
             "description": "The HTTP header value is the property value.  The header name is the property name.",
-            "longDescription": "This type shall contain the HTTP header name and value to include with every event POST to the event eestination.",
+            "longDescription": "This type shall contain the HTTP header name and value to include with every event POST to the event destination.",
             "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.",
@@ -374,19 +400,152 @@
             },
             "type": "object"
         },
+        "SNMPAuthenticationProtocols": {
+            "enum": [
+                "None",
+                "CommunityString",
+                "HMAC_MD5",
+                "HMAC_SHA96"
+            ],
+            "enumDescriptions": {
+                "CommunityString": "Trap community string authentication.",
+                "HMAC_MD5": "HMAC-MD5-96 authentication.",
+                "HMAC_SHA96": "HMAC-SHA-96 authentication.",
+                "None": "No authentication."
+            },
+            "enumLongDescriptions": {
+                "CommunityString": "This value shall indicate authentication using SNMP community strings and the value of TrapCommunity.",
+                "HMAC_MD5": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol.",
+                "HMAC_SHA96": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol.",
+                "None": "This value shall indicate authentication is not required."
+            },
+            "type": "string"
+        },
+        "SNMPEncryptionProtocols": {
+            "enum": [
+                "None",
+                "CBC_DES",
+                "CFB128_AES128"
+            ],
+            "enumDescriptions": {
+                "CBC_DES": "CBC-DES encryption.",
+                "CFB128_AES128": "CFB128-AES-128 encryption.",
+                "None": "No encryption."
+            },
+            "enumLongDescriptions": {
+                "CBC_DES": "This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol.",
+                "CFB128_AES128": "This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol.",
+                "None": "This value shall indicate there is no encryption."
+            },
+            "type": "string"
+        },
+        "SNMPSettings": {
+            "additionalProperties": false,
+            "description": "Settings for an SNMP event destination.",
+            "longDescription": "This type shall contain the settings for an SNMP event destination.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AuthenticationKey": {
+                    "description": "The secret authentication key for SNMPv3.",
+                    "longDescription": "This property shall contain the key used for SNMPv3 authentication.  The value shall be `null` in responses.",
+                    "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_7_0"
+                },
+                "AuthenticationProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPAuthenticationProtocols"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The authentication protocol for SNMPv3.",
+                    "longDescription": "This property shall contain the SNMPv3 authentication protocol.",
+                    "readonly": false,
+                    "versionAdded": "v1_7_0"
+                },
+                "EncryptionKey": {
+                    "description": "The secret authentication key for SNMPv3.",
+                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.",
+                    "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_7_0"
+                },
+                "EncryptionProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPEncryptionProtocols"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The encryption protocol for SNMPv3.",
+                    "longDescription": "This property shall contain the SNMPv3 encryption protocol.",
+                    "readonly": false,
+                    "versionAdded": "v1_7_0"
+                },
+                "TrapCommunity": {
+                    "description": "The SNMP trap community string.",
+                    "longDescription": "This property shall contain the SNMP trap community string.  The value shall be `null` in responses.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_7_0"
+                }
+            },
+            "type": "object"
+        },
         "SubscriptionType": {
             "enum": [
                 "RedfishEvent",
-                "SSE"
+                "SSE",
+                "SNMPTrap",
+                "SNMPInform"
             ],
             "enumDescriptions": {
                 "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."
             },
+            "enumLongDescriptions": {
+                "SNMPInform": "This value shall indicate the subscription follows versions 2 and 3 of SNMP Inform for event notifications.  EventDestinationProtocol shall specify the appropriate version of SNMP.",
+                "SNMPTrap": "This value shall indicate the subscription follows the various versions of SNMP Traps for event notifications.  EventDestinationProtocol shall specify the appropriate version of SNMP."
+            },
+            "enumVersionAdded": {
+                "SNMPInform": "v1_7_0",
+                "SNMPTrap": "v1_7_0"
+            },
             "type": "string"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.2",
-    "title": "#EventDestination.v1_6_0.EventDestination"
+    "release": "2019.3",
+    "title": "#EventDestination.v1_7_0.EventDestination"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/EventService/EventService.json b/static/redfish/v1/JsonSchemas/EventService/EventService.json
index f616f39..b40f102 100644
--- a/static/redfish/v1/JsonSchemas/EventService/EventService.json
+++ b/static/redfish/v1/JsonSchemas/EventService/EventService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/EventService.v1_4_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/EventService.v1_5_0.json",
     "$ref": "#/definitions/EventService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -172,6 +172,12 @@
                     "type": "array",
                     "versionAdded": "v1_2_0"
                 },
+                "SMTP": {
+                    "$ref": "#/definitions/SMTP",
+                    "description": "Settings for SMTP event delivery.",
+                    "longDescription": "This property shall contain settings for SMTP event delivery.",
+                    "versionAdded": "v1_5_0"
+                },
                 "SSEFilterPropertiesSupported": {
                     "$ref": "#/definitions/SSEFilterPropertiesSupported",
                     "description": "The set of properties that are supported in the $filter query parameter for the ServerSentEventUri.",
@@ -246,6 +252,163 @@
             "properties": {},
             "type": "object"
         },
+        "SMTP": {
+            "additionalProperties": false,
+            "description": "Settings for SMTP event delivery.",
+            "longDescription": "This type shall contain settings for SMTP event delivery.",
+            "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": {
+                "Authentication": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SMTPAuthenticationMethods"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The authentication method for the SMTP server.",
+                    "longDescription": "This property shall contain the authentication method for the SMTP server.",
+                    "readonly": false,
+                    "versionAdded": "v1_5_0"
+                },
+                "ConnectionProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SMTPConnectionProtocol"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The connection type to the outgoing SMTP server.",
+                    "longDescription": "This property shall contain the connection type to the outgoing SMTP server.",
+                    "readonly": false,
+                    "versionAdded": "v1_5_0"
+                },
+                "FromAddress": {
+                    "description": "The 'from' email address of the outgoing email.",
+                    "longDescription": "This property shall contain the email address to use for the 'from' field in an outgoing email.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "Password": {
+                    "description": "The password for authentication with the SMTP server.  The value is `null` in responses.",
+                    "longDescription": "This property shall contain the password for authentication with the SMTP server.  The value shall be `null` in responses.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "Port": {
+                    "description": "The destination SMTP port.",
+                    "longDescription": "This property shall contain the destination port for the SMTP server.",
+                    "maximum": 65535,
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "ServerAddress": {
+                    "description": "The address of the SMTP server.",
+                    "longDescription": "This property shall contain the address of the SMTP server for outgoing email.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "ServiceEnabled": {
+                    "description": "An indication if SMTP for event delivery is enabled.",
+                    "longDescription": "This property shall indicate if SMTP for event delivery is enabled.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "Username": {
+                    "description": "The username for authentication with the SMTP server.",
+                    "longDescription": "This property shall contain the username for authentication with the SMTP server.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                }
+            },
+            "type": "object"
+        },
+        "SMTPAuthenticationMethods": {
+            "enum": [
+                "None",
+                "AutoDetect",
+                "Plain",
+                "Login",
+                "CRAM_MD5"
+            ],
+            "enumDescriptions": {
+                "AutoDetect": "Auto-detect.",
+                "CRAM_MD5": "CRAM-MD5 authentication.",
+                "Login": "LOGIN authentication.",
+                "None": "No authentication.",
+                "Plain": "PLAIN authentication."
+            },
+            "enumLongDescriptions": {
+                "AutoDetect": "This value shall indicate authentication is auto-detected.",
+                "CRAM_MD5": "This value shall indicate authentication conforms to the RFC4954-defined AUTH CRAM-MD5 mechanism.",
+                "Login": "This value shall indicate authentication conforms to the RFC4954-defined AUTH LOGIN mechanism.",
+                "None": "This value shall indicate authentication is not required.",
+                "Plain": "This value shall indicate authentication conforms to the RFC4954-defined AUTH PLAIN mechanism."
+            },
+            "type": "string"
+        },
+        "SMTPConnectionProtocol": {
+            "enum": [
+                "None",
+                "AutoDetect",
+                "StartTLS",
+                "TLS_SSL"
+            ],
+            "enumDescriptions": {
+                "AutoDetect": "Auto-detect.",
+                "None": "Clear text.",
+                "StartTLS": "StartTLS.",
+                "TLS_SSL": "TLS/SSL."
+            },
+            "enumLongDescriptions": {
+                "AutoDetect": "This value shall indicate the connection is auto-detected.",
+                "None": "This value shall indicate the connection is in clear text.",
+                "StartTLS": "This value shall indicate the connection conforms to the RFC3207-defined StartTLS extension.",
+                "TLS_SSL": "This value shall indicate the connection is TLS/SSL."
+            },
+            "type": "string"
+        },
         "SSEFilterPropertiesSupported": {
             "additionalProperties": false,
             "description": "The set of properties that are supported in the $filter query parameter for the ServerSentEventUri.",
@@ -415,6 +578,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.2",
-    "title": "#EventService.v1_4_0.EventService"
+    "release": "2019.3",
+    "title": "#EventService.v1_5_0.EventService"
 }
\ 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 a368695..94a9134 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_4_3.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/LogEntry.v1_5_0.json",
     "$ref": "#/definitions/LogEntry",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -186,6 +186,17 @@
                     "versionAdded": "v1_1_0",
                     "versionDeprecated": "v1_4_0"
                 },
+                "GeneratorId": {
+                    "description": "An identifier of the device that has generated the IPMI SEL Event Record.",
+                    "longDescription": "If EntryType is `SEL`, this property shall contain the 'Generator ID' field of the IPMI SEL Event Record.  If EntryType is not `SEL`, this property should not be present.",
+                    "pattern": "^0[xX](([a-fA-F]|[0-9]){2}){2}$",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
@@ -215,7 +226,7 @@
                 },
                 "MessageId": {
                     "description": "The MessageId, event data, or OEM-specific information.  This property decodes from the entry type.  If the entry type is `Event`, this property contains a Redfish Specification-defined MessageId.  If the entry type is `SEL`, this property contains the Event Data.  Otherwise, this property contains OEM-specific information.",
-                    "longDescription": "This property shall contain the MessageId, event data, or OEM-specific information.  This property decodes from the entry type.  If the entry type is `Event`, this property contains a Redfish Specification-defined MessageId property of the event.  If the entry type is `SEL`, this property contains the three IPMI Event Data bytes.  In this case, the format should follow the `^0[xX](([a-fA-F]|[0-9]){2}){3}$` pattern, where Event Data 1 is the first byte in the string, Event Data 2 is the second byte in the string, and Event Data 3 is the third byte in the string.  Otherwise, this property contains OEM-specific information.",
+                    "longDescription": "This property shall contain the MessageId, event data, or OEM-specific information.  This property decodes from the entry type.  If the entry type is `Event`, this property contains a Redfish Specification-defined MessageId property of the event.  If the entry type is `SEL`, the format should follow the pattern '^0[xX](([a-fA-F]|[0-9]){2}){4}$', which results in a string in the form '0xNNaabbcc', where 'NN' is the EventDir/EventType byte, 'aa' is the Event Data 1 byte, 'bb' is Event Data 2 byte, 'cc' is Event Data 3 byte, corresponding with bytes 13-16 in the IPMI SEL Event Record.  Otherwise, this property contains OEM-specific information.",
                     "readonly": true,
                     "type": "string"
                 },
@@ -569,6 +580,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2018.2",
-    "title": "#LogEntry.v1_4_3.LogEntry"
+    "release": "2019.3",
+    "title": "#LogEntry.v1_5_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 aa89377..d880982 100644
--- a/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
+++ b/static/redfish/v1/JsonSchemas/ManagerAccount/ManagerAccount.json
@@ -1,9 +1,22 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_3_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerAccount.v1_4_0.json",
     "$ref": "#/definitions/ManagerAccount",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
+        "AccountTypes": {
+            "enum": [
+                "Redfish",
+                "SNMP",
+                "OEM"
+            ],
+            "enumDescriptions": {
+                "OEM": "OEM account type.",
+                "Redfish": "Allow access to the Redfish Service.",
+                "SNMP": "Allow access to SNMP services."
+            },
+            "type": "string"
+        },
         "Actions": {
             "additionalProperties": false,
             "description": "The available actions for this Resource.",
@@ -96,6 +109,23 @@
                 "@odata.type": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
                 },
+                "AccountTypes": {
+                    "description": "The account types.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/AccountTypes"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of the various account types that apply to the account.  If this property is not provided by the client, the default value shall be an array with the single value `Redfish`.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
                 "Actions": {
                     "$ref": "#/definitions/Actions",
                     "description": "The available actions for this Resource.",
@@ -145,6 +175,19 @@
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
                     "readonly": true
                 },
+                "OEMAccountTypes": {
+                    "description": "The OEM account types.",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of the OEM account types for this account.  This property shall be valid when AccountTypes contains `OEM`.",
+                    "readonly": false,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
                     "description": "The OEM extension property.",
@@ -175,6 +218,19 @@
                     "readonly": false,
                     "type": "string"
                 },
+                "SNMP": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPUserInfo"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The SNMP settings for this account.",
+                    "longDescription": "This property shall contain the SNMP settings for this account when AccountTypes contains `SNMP`.",
+                    "versionAdded": "v1_4_0"
+                },
                 "UserName": {
                     "description": "The user name for the account.",
                     "longDescription": "This property shall contain the user name for this account.",
@@ -186,7 +242,8 @@
                 "@odata.id",
                 "@odata.type",
                 "Id",
-                "Name"
+                "Name",
+                "AccountTypes"
             ],
             "requiredOnCreate": [
                 "Password",
@@ -215,9 +272,117 @@
             },
             "properties": {},
             "type": "object"
+        },
+        "SNMPAuthenticationProtocols": {
+            "enum": [
+                "None",
+                "HMAC_MD5",
+                "HMAC_SHA96"
+            ],
+            "enumDescriptions": {
+                "HMAC_MD5": "HMAC-MD5-96 authentication.",
+                "HMAC_SHA96": "HMAC-SHA-96 authentication.",
+                "None": "No authentication."
+            },
+            "enumLongDescriptions": {
+                "HMAC_MD5": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol.",
+                "HMAC_SHA96": "This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol.",
+                "None": "This value shall indicate authentication is not required."
+            },
+            "type": "string"
+        },
+        "SNMPEncryptionProtocols": {
+            "enum": [
+                "None",
+                "CBC_DES",
+                "CFB128_AES128"
+            ],
+            "enumDescriptions": {
+                "CBC_DES": "CBC-DES encryption.",
+                "CFB128_AES128": "CFB128-AES-128 encryption.",
+                "None": "No encryption."
+            },
+            "enumLongDescriptions": {
+                "CBC_DES": "This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol.",
+                "CFB128_AES128": "This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol.",
+                "None": "This value shall indicate there is no encryption."
+            },
+            "type": "string"
+        },
+        "SNMPUserInfo": {
+            "additionalProperties": false,
+            "description": "The SNMP settings for an account.",
+            "longDescription": "This object shall contain the SNMP settings for an account.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AuthenticationKey": {
+                    "description": "The secret authentication key for SNMPv3.",
+                    "longDescription": "This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses.",
+                    "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
+                "AuthenticationProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPAuthenticationProtocols"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The authentication protocol for SNMPv3.",
+                    "longDescription": "This property shall contain the SNMPv3 authentication protocol.",
+                    "readonly": false,
+                    "versionAdded": "v1_4_0"
+                },
+                "EncryptionKey": {
+                    "description": "The secret authentication key used in SNMPv3.",
+                    "longDescription": "This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses.",
+                    "pattern": "(^[A-Za-z0-9]+$)|(^\\*+$)",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
+                "EncryptionProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPEncryptionProtocols"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The encryption protocol for SNMPv3.",
+                    "longDescription": "This property shall contain the SNMPv3 encryption protocol.",
+                    "readonly": false,
+                    "versionAdded": "v1_4_0"
+                }
+            },
+            "type": "object"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.1",
-    "title": "#ManagerAccount.v1_3_1.ManagerAccount"
+    "release": "2019.3",
+    "title": "#ManagerAccount.v1_4_0.ManagerAccount"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json b/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
index d3f6771..81635e0 100644
--- a/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
+++ b/static/redfish/v1/JsonSchemas/ManagerNetworkProtocol/ManagerNetworkProtocol.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerNetworkProtocol.v1_4_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/ManagerNetworkProtocol.v1_5_0.json",
     "$ref": "#/definitions/ManagerNetworkProtocol",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -32,6 +32,50 @@
             },
             "type": "object"
         },
+        "EngineId": {
+            "additionalProperties": false,
+            "description": "The engine ID.",
+            "longDescription": "This object shall contain the RFC3411-defined engine ID.",
+            "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": {
+                "EnterpriseSpecificMethod": {
+                    "description": "The enterprise specific method.",
+                    "longDescription": "This property shall contain an RFC3411-defined enterprise specific method.",
+                    "pattern": "^([A-Fa-f0-9]{2} ){7}[A-Fa-f0-9]{2}$",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "PrivateEnterpriseId": {
+                    "description": "The private enterprise ID.",
+                    "longDescription": "This property shall contain an RFC3411-defined private enterprise ID.",
+                    "pattern": "^([A-Fa-f0-9]{2} ){3}[A-Fa-f0-9]{2}$",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                }
+            },
+            "type": "object"
+        },
         "HTTPSProtocol": {
             "additionalProperties": false,
             "description": "The settings for a network protocol associated with a manager.",
@@ -210,7 +254,7 @@
                     "versionAdded": "v1_3_0"
                 },
                 "SNMP": {
-                    "$ref": "#/definitions/Protocol",
+                    "$ref": "#/definitions/SNMPProtocol",
                     "description": "The settings for this manager's SNMP support.",
                     "longDescription": "This object shall contain the SNMP protocol settings for this manager.  The default Port property value should be `161` for compatibility with established client implementations."
                 },
@@ -377,6 +421,271 @@
             },
             "type": "object"
         },
+        "SNMPAuthenticationProtocols": {
+            "enum": [
+                "Account",
+                "CommunityString",
+                "HMAC_MD5",
+                "HMAC_SHA96"
+            ],
+            "enumDescriptions": {
+                "Account": "Authentication is determined by account settings.",
+                "CommunityString": "SNMP community string authentication.",
+                "HMAC_MD5": "HMAC-MD5-96 authentication.",
+                "HMAC_SHA96": "HMAC-SHA-96 authentication."
+            },
+            "enumLongDescriptions": {
+                "Account": "This value shall indicate authentication for SNMPv3 access is determined based on the corresponding account settings.",
+                "CommunityString": "This value shall indicate authentication uses SNMP community strings.",
+                "HMAC_MD5": "This value shall indicate authentication for SNMPv3 access conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol.",
+                "HMAC_SHA96": "This value shall indicate authentication for SNMPv3 access conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."
+            },
+            "type": "string"
+        },
+        "SNMPCommunity": {
+            "additionalProperties": false,
+            "description": "An SNMP community strings.",
+            "longDescription": "This object shall contain an SNMP community string used to access an SNMP 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.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AccessMode": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPCommunityAccessMode"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The access level of the SNMP community.",
+                    "longDescription": "This property shall contain the access/privilege level of the SNMP community used to access an SNMP manager.",
+                    "readonly": false,
+                    "versionAdded": "v1_5_0"
+                },
+                "CommunityString": {
+                    "description": "The SNMP community string.",
+                    "longDescription": "This property shall contain the SNMP community string used for accessing an SNMP service on this manager.  If HideCommunityStrings is `true`, this value shall be `null` in responses.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "Name": {
+                    "description": "The name of the SNMP community.",
+                    "longDescription": "This property shall contain a display name describing the SNMP community.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                }
+            },
+            "type": "object"
+        },
+        "SNMPCommunityAccessMode": {
+            "enum": [
+                "Full",
+                "Limited"
+            ],
+            "enumDescriptions": {
+                "Full": "READ-WRITE access mode.",
+                "Limited": "READ-ONLY access mode."
+            },
+            "enumLongDescriptions": {
+                "Full": "This value shall indicate the RFC1157-defined READ-WRITE access mode.",
+                "Limited": "This value shall indicate the RFC1157-defined READ-ONLY access mode."
+            },
+            "type": "string"
+        },
+        "SNMPEncryptionProtocols": {
+            "enum": [
+                "None",
+                "Account",
+                "CBC_DES",
+                "CFB128_AES128"
+            ],
+            "enumDescriptions": {
+                "Account": "Encryption is determined by account settings.",
+                "CBC_DES": "CBC-DES encryption.",
+                "CFB128_AES128": "CFB128-AES-128 encryption.",
+                "None": "No encryption."
+            },
+            "enumLongDescriptions": {
+                "Account": "This value shall indicate encryption is determined based on the corresponding account settings.",
+                "CBC_DES": "This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol.",
+                "CFB128_AES128": "This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol.",
+                "None": "This value shall indicate there is no encryption."
+            },
+            "type": "string"
+        },
+        "SNMPProtocol": {
+            "additionalProperties": false,
+            "description": "The settings for a network protocol associated with a manager.",
+            "longDescription": "This type shall describe information about a protocol setting for a 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.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "AuthenticationProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPAuthenticationProtocols"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The authentication protocol for SNMP.",
+                    "longDescription": "This property shall contain the SNMP authentication protocol.",
+                    "readonly": false,
+                    "versionAdded": "v1_5_0"
+                },
+                "CommunityAccessMode": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPCommunityAccessMode"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The access level of the SNMP community.",
+                    "longDescription": "This property shall contain the access/privilege level of the SNMP community used to access an SNMP manager.",
+                    "readonly": false,
+                    "versionAdded": "v1_5_0"
+                },
+                "CommunityStrings": {
+                    "description": "The SNMP community strings.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "#/definitions/SNMPCommunity"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "This property shall contain an array of the SNMP community strings used to access an SNMP manager.",
+                    "type": "array",
+                    "versionAdded": "v1_5_0"
+                },
+                "EnableSNMPv1": {
+                    "description": "Indicates if access via SNMPv1 is enabled.",
+                    "longDescription": "This property shall indicate if access to the SNMP service on this manager using the SNMPv1 protocol is enabled.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "EnableSNMPv2c": {
+                    "description": "Indicates if access via SNMPv2c is enabled.",
+                    "longDescription": "This property shall indicate if access to the SNMP service on this manager using the SNMPv2c protocol is enabled.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "EnableSNMPv3": {
+                    "description": "Indicates if access via SNMPv3 is enabled.",
+                    "longDescription": "This property shall indicate if access to the SNMP service on this manager using the SNMPv3 protocol is enabled.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "EncryptionProtocol": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/SNMPEncryptionProtocols"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The encryption protocol for SNMPv3.",
+                    "longDescription": "This property shall contain the SNMPv3 encryption protocol.",
+                    "readonly": false,
+                    "versionAdded": "v1_5_0"
+                },
+                "EngineId": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/EngineId"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The engine ID.",
+                    "longDescription": "This property shall contain the RFC3411-defined engine ID.",
+                    "versionAdded": "v1_5_0"
+                },
+                "HideCommunityStrings": {
+                    "description": "Indicates if the community strings should be hidden.",
+                    "longDescription": "This property shall indicate if the community strings should be hidden in responses.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_5_0"
+                },
+                "Port": {
+                    "description": "The protocol port.",
+                    "longDescription": "This property shall contain the port assigned to the protocol.",
+                    "minimum": 0,
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ]
+                },
+                "ProtocolEnabled": {
+                    "description": "An indication of whether the protocol is enabled.",
+                    "longDescription": "This property shall indicate whether the protocol is enabled.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
+                }
+            },
+            "type": "object"
+        },
         "SSDProtocol": {
             "additionalProperties": false,
             "description": "The settings for a network protocol associated with a manager.",
@@ -454,6 +763,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2018.3",
-    "title": "#ManagerNetworkProtocol.v1_4_2.ManagerNetworkProtocol"
+    "release": "2019.3",
+    "title": "#ManagerNetworkProtocol.v1_5_0.ManagerNetworkProtocol"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Power/Power.json b/static/redfish/v1/JsonSchemas/Power/Power.json
index 576c476..a361732 100644
--- a/static/redfish/v1/JsonSchemas/Power/Power.json
+++ b/static/redfish/v1/JsonSchemas/Power/Power.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Power.v1_5_4.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Power.v1_6_0.json",
     "$ref": "#/definitions/Power",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#Power.PowerSupplyReset": {
+                    "$ref": "#/definitions/PowerSupplyReset"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this Resource.",
@@ -985,6 +988,51 @@
             "properties": {},
             "type": "object"
         },
+        "PowerSupplyReset": {
+            "additionalProperties": false,
+            "description": "This action resets the targeted power supply.",
+            "longDescription": "This action shall reset a power supply specified by the MemberId from the PowerSupplies array.  A `GracefulRestart` ResetType shall reset the power supply but shall not affect the power output.  A `ForceRestart` ResetType may affect the power supply output.",
+            "parameters": {
+                "MemberId": {
+                    "description": "The MemberId of the power supply within the PowerSupplies array on which to perform the reset.",
+                    "longDescription": "This parameter shall contain the identifier of the member within the PowerSupplies array on which to perform the reset.",
+                    "requiredParameter": true,
+                    "type": "string"
+                },
+                "ResetType": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/ResetType",
+                    "description": "The type of reset.",
+                    "longDescription": "This parameter shall contain the type of reset.  The Service may accept a request without the parameter and shall perform a `GracefulRestart`."
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_6_0"
+        },
         "PowerSupplyType": {
             "enum": [
                 "Unknown",
@@ -1226,6 +1274,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2017.3",
-    "title": "#Power.v1_5_4.Power"
+    "release": "2019.3",
+    "title": "#Power.v1_6_0.Power"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Processor/Processor.json b/static/redfish/v1/JsonSchemas/Processor/Processor.json
index 508bbdc..263404d 100644
--- a/static/redfish/v1/JsonSchemas/Processor/Processor.json
+++ b/static/redfish/v1/JsonSchemas/Processor/Processor.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Processor.v1_5_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Processor.v1_6_0.json",
     "$ref": "#/definitions/Processor",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -23,6 +23,9 @@
                 }
             },
             "properties": {
+                "#Processor.Reset": {
+                    "$ref": "#/definitions/Reset"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this Resource.",
@@ -788,8 +791,8 @@
                     ]
                 },
                 "IdentificationRegisters": {
-                    "description": "The raw manufacturer-provided CPUID instruction output for this processor.",
-                    "longDescription": "This property shall contain the raw manufacturer-provided CPUID instruction output for this processor.",
+                    "description": "The raw manufacturer-provided processor identification registers for this processor.",
+                    "longDescription": "This property shall contain the raw manufacturer-provided processor-specific identification registers of this processor's features.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -980,9 +983,48 @@
                 "Thread": "v1_3_0"
             },
             "type": "string"
+        },
+        "Reset": {
+            "additionalProperties": false,
+            "description": "This action resets the processor.",
+            "longDescription": "This action shall reset the processor.",
+            "parameters": {
+                "ResetType": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/ResetType",
+                    "description": "The type of reset.",
+                    "longDescription": "This parameter shall contain the type of reset.  The Service may accept a request without the parameter and perform an implementation specific default reset."
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_6_0"
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.1",
-    "title": "#Processor.v1_5_1.Processor"
+    "release": "2019.3",
+    "title": "#Processor.v1_6_0.Processor"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Resource/Resource.json b/static/redfish/v1/JsonSchemas/Resource/Resource.json
index 8dab645..ba152de 100644
--- a/static/redfish/v1/JsonSchemas/Resource/Resource.json
+++ b/static/redfish/v1/JsonSchemas/Resource/Resource.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_8_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Resource.v1_8_3.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -1034,5 +1034,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.3",
-    "title": "#Resource.v1_8_2"
+    "title": "#Resource.v1_8_3"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json b/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
index 603c1e6..d934265 100644
--- a/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
+++ b/static/redfish/v1/JsonSchemas/Sensor/Sensor.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_0_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Sensor.v1_0_3.json",
     "$ref": "#/definitions/Sensor",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -266,14 +266,15 @@
                     ]
                 },
                 "ApparentVA": {
-                    "description": "The product of voltage and current for an AC circuit, in Volt-Amperes units.",
+                    "description": "The product of voltage and current for an AC circuit, in Volt-Ampere units.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  PowerApparentVA is expressed in Volt-Amperes units by using the ReadingUnits `V` value.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
                         "null"
-                    ]
+                    ],
+                    "units": "V.A"
                 },
                 "Description": {
                     "anyOf": [
@@ -305,7 +306,6 @@
                 },
                 "LoadPercent": {
                     "description": "The power load utilization for this sensor.",
-                    "excerpt": "SensorPower",
                     "longDescription": "This property shall indicate the power load utilization percent for this sensor.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
@@ -339,7 +339,6 @@
                 },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
-                    "excerpt": "Sensor",
                     "readonly": true
                 },
                 "Oem": {
@@ -349,7 +348,6 @@
                 },
                 "PeakReading": {
                     "description": "The peak sensor value.",
-                    "excerpt": "Sensor",
                     "longDescription": "This property shall contain the peak sensor value since the last ResetStatistics action was performed or the service last reset the time-based property values.",
                     "readonly": true,
                     "type": [
@@ -377,7 +375,7 @@
                         }
                     ],
                     "description": "The area or device to which this sensor measurement applies.",
-                    "excerpt": "Sensor",
+                    "excerpt": "SensorArray",
                     "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
                     "readonly": true
                 },
@@ -391,7 +389,7 @@
                         }
                     ],
                     "description": "The usage or location within a device to which this sensor measurement applies.",
-                    "excerpt": "Sensor",
+                    "excerpt": "SensorArray",
                     "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance.",
                     "readonly": true
                 },
@@ -417,14 +415,15 @@
                     ]
                 },
                 "ReactiveVAR": {
-                    "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in VAR units.",
+                    "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  PowerReactiveVAR is expressed in VAR units by using the ReadingUnits `V` value.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
                         "null"
-                    ]
+                    ],
+                    "units": "V.A"
                 },
                 "Reading": {
                     "description": "The sensor value.",
@@ -529,6 +528,95 @@
             ],
             "type": "object"
         },
+        "SensorArrayExcerpt": {
+            "additionalProperties": false,
+            "description": "The Sensor schema describes a sensor and its properties.",
+            "excerpt": "SensorArray",
+            "longDescription": "This Resource represents a Sensor for a Redfish implementation.",
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "DataSourceUri": {
+                    "description": "The link to the Resource that provides the data for this sensor.",
+                    "excerptCopyOnly": true,
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain a URI to the Resource that provides the source of the Excerpt contained within this copy.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "PhysicalContext": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The area or device to which this sensor measurement applies.",
+                    "excerpt": "SensorArray",
+                    "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
+                    "readonly": true
+                },
+                "PhysicalSubContext": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalSubContext"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "The usage or location within a device to which this sensor measurement applies.",
+                    "excerpt": "SensorArray",
+                    "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance.",
+                    "readonly": true
+                },
+                "Reading": {
+                    "description": "The sensor value.",
+                    "excerpt": "Sensor",
+                    "longDescription": "This property shall contain the sensor value.",
+                    "readonly": true,
+                    "type": [
+                        "number",
+                        "null"
+                    ]
+                },
+                "ReadingUnits": {
+                    "description": "The units of the reading and thresholds.",
+                    "excerpt": "Sensor",
+                    "longDescription": "This property shall contain the units of the sensor's reading and thresholds.",
+                    "readonly": true,
+                    "type": [
+                        "string",
+                        "null"
+                    ]
+                },
+                "Status": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The status and health of the Resource and its subordinate or dependent Resources.",
+                    "excerpt": "Sensor",
+                    "longDescription": "This property shall contain the status and health of the Resource and its children."
+                }
+            },
+            "required": [],
+            "type": "object"
+        },
         "SensorExcerpt": {
             "additionalProperties": false,
             "description": "The Sensor schema describes a sensor and its properties.",
@@ -560,49 +648,6 @@
                         "null"
                     ]
                 },
-                "Name": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
-                    "excerpt": "Sensor",
-                    "readonly": true
-                },
-                "PeakReading": {
-                    "description": "The peak sensor value.",
-                    "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the peak sensor value since the last ResetStatistics action was performed or the service last reset the time-based property values.",
-                    "readonly": true,
-                    "type": [
-                        "number",
-                        "null"
-                    ]
-                },
-                "PhysicalContext": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
-                    "description": "The area or device to which this sensor measurement applies.",
-                    "excerpt": "Sensor",
-                    "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
-                    "readonly": true
-                },
-                "PhysicalSubContext": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalSubContext"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
-                    "description": "The usage or location within a device to which this sensor measurement applies.",
-                    "excerpt": "Sensor",
-                    "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance.",
-                    "readonly": true
-                },
                 "Reading": {
                     "description": "The sensor value.",
                     "excerpt": "Sensor",
@@ -630,9 +675,7 @@
                     "longDescription": "This property shall contain the status and health of the Resource and its children."
                 }
             },
-            "required": [
-                "Name"
-            ],
+            "required": [],
             "type": "object"
         },
         "SensorPowerExcerpt": {
@@ -656,14 +699,15 @@
             },
             "properties": {
                 "ApparentVA": {
-                    "description": "The product of voltage and current for an AC circuit, in Volt-Amperes units.",
+                    "description": "The product of voltage and current for an AC circuit, in Volt-Ampere units.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  PowerApparentVA is expressed in Volt-Amperes units by using the ReadingUnits `V` value.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
                         "null"
-                    ]
+                    ],
+                    "units": "V.A"
                 },
                 "DataSourceUri": {
                     "description": "The link to the Resource that provides the data for this sensor.",
@@ -676,60 +720,6 @@
                         "null"
                     ]
                 },
-                "LoadPercent": {
-                    "description": "The power load utilization for this sensor.",
-                    "excerpt": "SensorPower",
-                    "longDescription": "This property shall indicate the power load utilization percent for this sensor.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
-                    "readonly": true,
-                    "type": [
-                        "number",
-                        "null"
-                    ],
-                    "units": "%"
-                },
-                "Name": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
-                    "excerpt": "Sensor",
-                    "readonly": true
-                },
-                "PeakReading": {
-                    "description": "The peak sensor value.",
-                    "excerpt": "Sensor",
-                    "longDescription": "This property shall contain the peak sensor value since the last ResetStatistics action was performed or the service last reset the time-based property values.",
-                    "readonly": true,
-                    "type": [
-                        "number",
-                        "null"
-                    ]
-                },
-                "PhysicalContext": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalContext"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
-                    "description": "The area or device to which this sensor measurement applies.",
-                    "excerpt": "Sensor",
-                    "longDescription": "This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies.",
-                    "readonly": true
-                },
-                "PhysicalSubContext": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/v1/PhysicalContext.json#/definitions/PhysicalSubContext"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
-                    "description": "The usage or location within a device to which this sensor measurement applies.",
-                    "excerpt": "Sensor",
-                    "longDescription": "This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance.",
-                    "readonly": true
-                },
                 "PowerFactor": {
                     "description": "The power factor for this sensor.",
                     "excerpt": "SensorPower",
@@ -743,14 +733,15 @@
                     ]
                 },
                 "ReactiveVAR": {
-                    "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in VAR units.",
+                    "description": "The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units.",
                     "excerpt": "SensorPower",
-                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  PowerReactiveVAR is expressed in VAR units by using the ReadingUnits `V` value.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
+                    "longDescription": "This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values.",
                     "readonly": true,
                     "type": [
                         "number",
                         "null"
-                    ]
+                    ],
+                    "units": "V.A"
                 },
                 "Reading": {
                     "description": "The sensor value.",
@@ -779,9 +770,7 @@
                     "longDescription": "This property shall contain the status and health of the Resource and its children."
                 }
             },
-            "required": [
-                "Name"
-            ],
+            "required": [],
             "type": "object"
         },
         "Threshold": {
@@ -922,5 +911,5 @@
     },
     "owningEntity": "DMTF",
     "release": "2018.3",
-    "title": "#Sensor.v1_0_2.Sensor"
+    "title": "#Sensor.v1_0_3.Sensor"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Settings/Settings.json b/static/redfish/v1/JsonSchemas/Settings/Settings.json
index 40a1df4..d6044d5 100644
--- a/static/redfish/v1/JsonSchemas/Settings/Settings.json
+++ b/static/redfish/v1/JsonSchemas/Settings/Settings.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Settings.v1_2_2.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Settings.v1_3_0.json",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
@@ -246,6 +246,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2018.1",
-    "title": "#Settings.v1_2_2"
+    "release": "2019.3",
+    "title": "#Settings.v1_3_0"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Storage/Storage.json b/static/redfish/v1/JsonSchemas/Storage/Storage.json
index 581dd05..e5d4b32 100644
--- a/static/redfish/v1/JsonSchemas/Storage/Storage.json
+++ b/static/redfish/v1/JsonSchemas/Storage/Storage.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_7_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Storage.v1_8_0.json",
     "$ref": "#/definitions/Storage",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -282,6 +282,13 @@
                     "description": "The available actions for this Resource.",
                     "longDescription": "This property shall contain the available actions for this Resource."
                 },
+                "ConsistencyGroups": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/ConsistencyGroupCollection.json#/definitions/ConsistencyGroupCollection",
+                    "description": "The consistency groups, each of which contains a set of volumes that are treated by an application or set of applications as a single resource, that are managed by this storage subsystem.",
+                    "longDescription": "This property shall contain a link to a Resource of type ConsistencyGroupCollection.  The property shall be used when groups of volumes are treated as a single resource by an application or set of applications.",
+                    "readonly": true,
+                    "versionAdded": "v1_8_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -305,6 +312,20 @@
                 "Drives@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
+                "EndpointGroups": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/EndpointGroupCollection.json#/definitions/EndpointGroupCollection",
+                    "description": "All of the endpoint groups, each of which contains a set of endpoints that are used for a common purpose such as an ACL or logical identification, that belong to this storage subsystem.",
+                    "longDescription": "This property shall contain a link to a Resource of type EndpointGroupCollection.  This property shall be implemented when atomic control is needed to perform mapping, masking and zoning operations.",
+                    "readonly": true,
+                    "versionAdded": "v1_8_0"
+                },
+                "FileSystems": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/FileSystemCollection.json#/definitions/FileSystemCollection",
+                    "description": "All filesystems that are allocated by this storage subsystem.",
+                    "longDescription": "This property shall contain a link to a Resource of type FileSystemCollection.  This property shall be used when file systems are shared or exported by the storage subsystem.",
+                    "readonly": true,
+                    "versionAdded": "v1_8_0"
+                },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
                     "readonly": true
@@ -353,6 +374,20 @@
                 "StorageControllers@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
+                "StorageGroups": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageGroupCollection.json#/definitions/StorageGroupCollection",
+                    "description": "All of the storage groups, each of which contains a set of volumes and endpoints that are managed as a group for mapping and masking, that belong to this storage subsystem.",
+                    "longDescription": "This property shall contain a link to a Resource of type StorageGroupsCollection.  This property shall be used when implementing mapping and masking.",
+                    "readonly": true,
+                    "versionAdded": "v1_8_0"
+                },
+                "StoragePools": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StoragePoolCollection.json#/definitions/StoragePoolCollection",
+                    "description": "The set of all storage pools that are allocated by this storage subsystem.  A storage pool is the set of storage capacity that can be used to produce volumes or other storage pools.",
+                    "longDescription": "This property shall contain a link to a Resource of type StoragePoolCollection.  This property shall be used when an abstraction of media, rather than references to individual media, are used as the storage data source.",
+                    "readonly": true,
+                    "versionAdded": "v1_8_0"
+                },
                 "Volumes": {
                     "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/VolumeCollection.json#/definitions/VolumeCollection",
                     "description": "The set of volumes that the storage controllers produce.",
@@ -704,6 +739,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.1",
-    "title": "#Storage.v1_7_1.Storage"
+    "release": "2019.3",
+    "title": "#Storage.v1_8_0.Storage"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json b/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
index 203cc22..e384be9 100644
--- a/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
+++ b/static/redfish/v1/JsonSchemas/UpdateService/UpdateService.json
@@ -1,5 +1,5 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_6_0.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/UpdateService.v1_7_0.json",
     "$ref": "#/definitions/UpdateService",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
     "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
@@ -26,6 +26,9 @@
                 "#UpdateService.SimpleUpdate": {
                     "$ref": "#/definitions/SimpleUpdate"
                 },
+                "#UpdateService.StartUpdate": {
+                    "$ref": "#/definitions/StartUpdate"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
                     "description": "The available OEM-specific actions for this Resource.",
@@ -216,6 +219,39 @@
             },
             "type": "object"
         },
+        "StartUpdate": {
+            "additionalProperties": false,
+            "description": "This action starts an update of software components.",
+            "longDescription": "This action shall start an update of software component that have been scheduled with the OperationApplyTime value of `OnStartUpdateRequest`.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object",
+            "versionAdded": "v1_7_0"
+        },
         "TransferProtocolType": {
             "enum": [
                 "CIFS",
@@ -453,6 +489,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2019.2",
-    "title": "#UpdateService.v1_6_0.UpdateService"
+    "release": "2019.3",
+    "title": "#UpdateService.v1_7_0.UpdateService"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/JsonSchemas/Volume/Volume.json b/static/redfish/v1/JsonSchemas/Volume/Volume.json
index 0f8d402..9325de1 100644
--- a/static/redfish/v1/JsonSchemas/Volume/Volume.json
+++ b/static/redfish/v1/JsonSchemas/Volume/Volume.json
@@ -1,12 +1,13 @@
 {
+    "$id": "http://redfish.dmtf.org/schemas/swordfish/v1/Volume.v1_4_0.json",
     "$ref": "#/definitions/Volume",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2016-2018 Storage Networking Industry Association (SNIA), USA. All rights reserved. For the full SNIA copyright policy, see http://www.snia.org/about/corporate_info/copyright",
+    "copyright": "Copyright 2016-2019 Storage Networking Industry Association (SNIA), USA. All rights reserved. For the full SNIA copyright policy, see http://www.snia.org/about/corporate_info/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -20,25 +21,65 @@
                 }
             },
             "properties": {
+                "#Volume.AssignReplicaTarget": {
+                    "$ref": "#/definitions/AssignReplicaTarget"
+                },
                 "#Volume.CheckConsistency": {
                     "$ref": "#/definitions/CheckConsistency"
                 },
+                "#Volume.CreateReplicaTarget": {
+                    "$ref": "#/definitions/CreateReplicaTarget"
+                },
                 "#Volume.Initialize": {
                     "$ref": "#/definitions/Initialize"
                 },
+                "#Volume.RemoveReplicaRelationship": {
+                    "$ref": "#/definitions/RemoveReplicaRelationship"
+                },
+                "#Volume.ResumeReplication": {
+                    "$ref": "#/definitions/ResumeReplication"
+                },
+                "#Volume.ReverseReplicationRelationship": {
+                    "$ref": "#/definitions/ReverseReplicationRelationship"
+                },
+                "#Volume.SplitReplication": {
+                    "$ref": "#/definitions/SplitReplication"
+                },
+                "#Volume.SuspendReplication": {
+                    "$ref": "#/definitions/SuspendReplication"
+                },
                 "Oem": {
                     "$ref": "#/definitions/OemActions"
                 }
             },
             "type": "object"
         },
-        "CheckConsistency": {
+        "AssignReplicaTarget": {
             "additionalProperties": false,
-            "description": "This action is used to force a check of the Volume's parity or redundant data to ensure it matches calculated values.",
-            "longDescription": "This defines the name of the custom action supported on this resource.",
-            "parameters": {},
+            "description": "This action is used to establish a replication relationship by assigning an existing volume to serve as a target replica for an existing source volume.",
+            "longDescription": "This action shall be used to establish a replication relationship by assigning an existing volume to serve as a target replica for an existing source volume.",
+            "parameters": {
+                "ReplicaType": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo.json#/definitions/ReplicaType",
+                    "description": "The type of replica relationship to be created.",
+                    "longDescription": "This parameter shall contain the type of replica relationship to be created (e.g., Clone, Mirror, Snap).",
+                    "requiredParameter": true
+                },
+                "ReplicaUpdateMode": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo.json#/definitions/ReplicaUpdateMode",
+                    "description": "The replica update mode (synchronous vs asynchronous).",
+                    "longDescription": "This parameter shall specify the replica update mode.",
+                    "requiredParameter": true
+                },
+                "TargetVolume": {
+                    "description": "The Uri to the existing target volume.",
+                    "longDescription": "This parameter shall contain the Uri to the existing target volume.",
+                    "requiredParameter": true,
+                    "type": "string"
+                }
+            },
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -54,7 +95,95 @@
             "properties": {
                 "target": {
                     "description": "Link to invoke action",
-                    "format": "uri",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "CheckConsistency": {
+            "additionalProperties": false,
+            "description": "This action is used to force a check of the Volume's parity or redundant data to ensure it matches calculated values.",
+            "longDescription": "This defines the name of the custom action supported on this resource.",
+            "parameters": {},
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "CreateReplicaTarget": {
+            "additionalProperties": false,
+            "description": "This action is used to create a new volume resource to provide expanded data protection through a replica relationship with the specified source volume.",
+            "longDescription": "This action shall be used to create a new volume resource to provide expanded data protection through a replica relationship with the specified source volume.",
+            "parameters": {
+                "ReplicaType": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo.json#/definitions/ReplicaType",
+                    "description": "The type of replica relationship to be created.",
+                    "longDescription": "This parameter shall contain the type of replica relationship to be created (e.g., Clone, Mirror, Snap).",
+                    "requiredParameter": true
+                },
+                "ReplicaUpdateMode": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo.json#/definitions/ReplicaUpdateMode",
+                    "description": "The replica update mode (synchronous vs asynchronous).",
+                    "longDescription": "This parameter shall specify the replica update mode.",
+                    "requiredParameter": true
+                },
+                "TargetStoragePool": {
+                    "description": "The Uri to the existing target Storage Pool.",
+                    "longDescription": "This parameter shall contain the Uri to the existing StoragePool in which to create the target volume.",
+                    "requiredParameter": true,
+                    "type": "string"
+                },
+                "VolumeName": {
+                    "description": "The Name for the new target volume.",
+                    "longDescription": "This parameter shall contain the Name for the target volume.",
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
                     "type": "string"
                 },
                 "title": {
@@ -89,7 +218,7 @@
                 }
             },
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -105,7 +234,7 @@
             "properties": {
                 "target": {
                     "description": "Link to invoke action",
-                    "format": "uri",
+                    "format": "uri-reference",
                     "type": "string"
                 },
                 "title": {
@@ -115,22 +244,11 @@
             },
             "type": "object"
         },
-        "InitializeType": {
-            "enum": [
-                "Fast",
-                "Slow"
-            ],
-            "enumDescriptions": {
-                "Fast": "The volume is prepared for use quickly, typically by erasing just the beginning and end of the space so that partitioning can be performed.",
-                "Slow": "The volume is prepared for use slowly, typically by completely erasing the volume."
-            },
-            "type": "string"
-        },
         "Links": {
             "additionalProperties": false,
             "description": "Add ability to manage spare capacity.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -145,17 +263,37 @@
             },
             "properties": {
                 "ClassOfService": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/ClassOfService.json#/definitions/ClassOfService"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/ClassOfService.json#/definitions/ClassOfService",
                     "description": "The ClassOfService that this storage volume conforms to.",
                     "longDescription": "This property shall contain a reference to the ClassOfService that this storage volume conforms to.",
-                    "readonly": true
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
+                "ClientEndpoints": {
+                    "description": "An array of references to the client Endpoints associated with this volume.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Endpoint.json#/definitions/Endpoint"
+                    },
+                    "longDescription": "The value of this property shall be references to the client Endpoints this volume is associated with.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
+                "ClientEndpoints@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                },
+                "ConsistencyGroups": {
+                    "description": "An array of references to the ConsistencyGroups associated with this volume.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/ConsistencyGroup.json#/definitions/ConsistencyGroup"
+                    },
+                    "longDescription": "The value of this property shall be references to the ConsistencyGroups this volume is associated with.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
+                "ConsistencyGroups@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
                 },
                 "DedicatedSpareDrives": {
                     "description": "An array of references to the drives which are dedicated spares for this volume.",
@@ -164,7 +302,8 @@
                     },
                     "longDescription": "The value of this property shall be a reference to the resources that this volume is associated with and shall reference resources of type Drive. This property shall only contain references to Drive entities which are currently assigned as a dedicated spare and are able to support this Volume.",
                     "readonly": true,
-                    "type": "array"
+                    "type": "array",
+                    "versionAdded": "v1_2_0"
                 },
                 "DedicatedSpareDrives@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
@@ -186,6 +325,26 @@
                     "description": "Oem extension object.",
                     "longDescription": "This object represents the Oem property.  All values for resources described by this schema shall comply to the requirements as described in the Redfish specification."
                 },
+                "OwningStorageService": {
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageService.json#/definitions/StorageService",
+                    "description": "A pointer to the StorageService that owns or contains this volume.",
+                    "longDescription": "This shall be a pointer to the StorageService that owns or contains this volume.",
+                    "readonly": true,
+                    "versionAdded": "v1_4_0"
+                },
+                "ServerEndpoints": {
+                    "description": "An array of references to the server Endpoints associated with this volume.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/Endpoint.json#/definitions/Endpoint"
+                    },
+                    "longDescription": "The value of this property shall be references to the server Endpoints this volume is associated with.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
+                "ServerEndpoints@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                },
                 "SpareResourceSets": {
                     "description": "An array of references to SpareResourceSets.",
                     "items": {
@@ -193,10 +352,24 @@
                     },
                     "longDescription": "Each referenced SpareResourceSet shall contain resources that may be utilized to replace the capacity provided by a failed resource having a compatible type.",
                     "readonly": false,
-                    "type": "array"
+                    "type": "array",
+                    "versionAdded": "v1_3_0"
                 },
                 "SpareResourceSets@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                },
+                "StorageGroups": {
+                    "description": "An array of references to the StorageGroups associated with this volume.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageGroup.json#/definitions/StorageGroup"
+                    },
+                    "longDescription": "The value of this property shall be references to the StorageGroups this volume is associated with.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_4_0"
+                },
+                "StorageGroups@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
                 }
             },
             "type": "object"
@@ -204,7 +377,7 @@
         "OemActions": {
             "additionalProperties": true,
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -223,7 +396,7 @@
         "Operation": {
             "additionalProperties": false,
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -261,68 +434,225 @@
             },
             "type": "object"
         },
-        "RAIDType": {
+        "ReadCachePolicyType": {
             "enum": [
-                "RAID0",
-                "RAID1",
-                "RAID3",
-                "RAID4",
-                "RAID5",
-                "RAID6",
-                "RAID10",
-                "RAID01",
-                "RAID6TP",
-                "RAID1E",
-                "RAID50",
-                "RAID60",
-                "RAID00",
-                "RAID10E",
-                "RAID1Triple",
-                "RAID10Triple"
+                "ReadAhead",
+                "AdaptiveReadAhead",
+                "Off"
             ],
             "enumDescriptions": {
-                "RAID0": "A placement policy where consecutive logical blocks of data are uniformly distributed across a set of independent storage devices without offering any form of redundancy.",
-                "RAID00": "A placement policy that creates a RAID 0 stripe set over two or more RAID 0 sets.",
-                "RAID01": "A data placement policy that creates a mirrored device (RAID 1) over a set of striped devices (RAID 0).",
-                "RAID1": "A placement policy where each logical block of data is stored on more than one independent storage device.",
-                "RAID10": "A placement policy that creates a striped device (RAID 0) over a set of mirrored devices (RAID 1).",
-                "RAID10E": "A placement policy that uses a RAID 0 stripe set over two or more RAID 10 sets.",
-                "RAID10Triple": "A placement policy that uses a striped device (RAID 0) over a set of triple mirrored devices (RAID 1Triple).",
-                "RAID1E": "A placement policy that uses a form of mirroring implemented over a set of independent storage devices where logical blocks are duplicated on a pair of independent storage devices so that data is uniformly distributed across the storage devices.",
-                "RAID1Triple": "A placement policy where each logical block of data is mirrored three times across a set of three independent storage devices.",
-                "RAID3": "A placement policy using parity-based protection where logical bytes of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device.",
-                "RAID4": "A placement policy using parity-based protection where logical blocks of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device.",
-                "RAID5": "A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and one logical block of parity across a set of 'n+1' independent storage devices where the parity and data blocks are interleaved across the storage devices.",
-                "RAID50": "A placement policy that uses a RAID 0 stripe set over two or more RAID 5 sets of independent storage devices.",
-                "RAID6": "A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and two logical blocks of independent parity across a set of 'n+2' independent storage devices where the parity and data blocks are interleaved across the storage devices.",
-                "RAID60": "A placement policy that uses a RAID 0 stripe set over two or more RAID 6 sets of independent storage devices.",
-                "RAID6TP": "A placement policy that uses parity-based protection for storing stripes of 'n' logical blocks of data and three logical blocks of independent parity across a set of 'n+3' independent storage devices where the parity and data blocks are interleaved across the storage devices. This is commonly referred to as Triple Parity RAID. Data stored using this form of RAID is able to survive any three independent storage device failures without data loss."
-            },
-            "enumLongDescriptions": {
-                "RAID0": "A placement policy where consecutive logical blocks of data are uniformly distributed across a set of independent storage devices without offering any form of redundancy. This is commonly referred to as data striping. This form of RAID will encounter data loss with the failure of any storage device in the set.",
-                "RAID00": "A placement policy that creates a RAID 0 stripe set over two or more RAID 0 sets. This is commonly referred to as RAID 0+0. This form of data layout is not fault tolerant; if any storage device fails there will be data loss.",
-                "RAID01": "A data placement policy that creates a mirrored device (RAID 1) over a set of striped devices (RAID 0). This is commonly referred to as RAID 0+1 or RAID 0/1. Data stored using this form of RAID is able to survive a single RAID 0 data set failure without data loss.",
-                "RAID1": "A placement policy where each logical block of data is stored on more than one independent storage device. This is commonly referred to as mirroring. Data stored using this form of RAID is able to survive a single storage device failure without data loss.",
-                "RAID10": "A placement policy that creates a striped device (RAID 0) over a set of mirrored devices (RAID 1). This is commonly referred to as RAID 1/0. Data stored using this form of RAID is able to survive storage device failures in each RAID 1 set without data loss.",
-                "RAID10E": "A placement policy that uses a RAID 0 stripe set over two or more RAID 10 sets. This is commonly referred to as Enhanced RAID 10. Data stored using this form of RAID is able to survive a single device failure within each nested RAID 1 set without data loss.",
-                "RAID10Triple": "A placement policy that uses a striped device (RAID 0) over a set of triple mirrored devices (RAID 1Triple). This form of RAID can survive up to two failures in each triple mirror set without data loss. ",
-                "RAID1E": "A placement policy that uses a form of mirroring implemented over a set of independent storage devices where logical blocks are duplicated on a pair of independent storage devices so that data is uniformly distributed across the storage devices. This is commonly referred to as RAID 1 Enhanced. Data stored using this form of RAID is able to survive a single storage device failure without data loss.",
-                "RAID1Triple": "A placement policy where each logical block of data is mirrored three times across a set of three independent storage devices. This is commonly referred to as three-way mirroring. This form of RAID can survive two device failures without data loss.",
-                "RAID3": "A placement policy using parity-based protection where logical bytes of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device. Data stored using this form of RAID is able to survive a single storage device failure without data loss. If the storage devices use rotating media, they are assumed to be rotationally synchronized, and the data stripe size should be no larger than the exported block size.",
-                "RAID4": "A placement policy using parity-based protection where logical blocks of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device. Data stored using this form of RAID is able to survive a single storage device failure without data loss.",
-                "RAID5": "A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and one logical block of parity across a set of 'n+1' independent storage devices where the parity and data blocks are interleaved across the storage devices. Data stored using this form of RAID is able to survive a single storage device failure without data loss.",
-                "RAID50": "A placement policy that uses a RAID 0 stripe set over two or more RAID 5 sets of independent storage devices. Data stored using this form of RAID is able to survive a single storage device failure within each RAID 5 set without data loss.",
-                "RAID6": "A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and two logical blocks of independent parity across a set of 'n+2' independent storage devices where the parity and data blocks are interleaved across the storage devices. Data stored using this form of RAID is able to survive any two independent storage device failures without data loss.",
-                "RAID60": "A placement policy that uses a RAID 0 stripe set over two or more RAID 6 sets of independent storage devices. Data stored using this form of RAID is able to survive two device failures within each RAID 6 set without data loss."
+                "AdaptiveReadAhead": "A caching technique in which the controller dynamically determines whether to pre-fetch data anticipating future read requests, based on previous cache hit ratio.",
+                "Off": "The read cache is disabled.",
+                "ReadAhead": "A caching technique in which the controller pre-fetches data anticipating future read requests."
             },
             "type": "string"
         },
+        "RemoveReplicaRelationship": {
+            "additionalProperties": false,
+            "description": "This action is used to disable data synchronization between a source and target volume, remove the replication relationship, and optionally delete the target volume.",
+            "longDescription": "This action shall be used to disable data synchronization between a source and target volume, remove the replication relationship, and optionally delete the target volume.",
+            "parameters": {
+                "DeleteTargetVolume": {
+                    "description": "Indicate whether or not to delete the target volume as part of the operation.",
+                    "longDescription": "This parameter shall indicate whether or not to delete the target volume as part of the operation. If not defined, the system should use its default behavior.",
+                    "type": "boolean"
+                },
+                "TargetVolume": {
+                    "description": "The Uri to the existing target volume.",
+                    "longDescription": "This parameter shall contain the Uri to the existing target volume.",
+                    "requiredParameter": true,
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "ResumeReplication": {
+            "additionalProperties": false,
+            "description": "This action is used to resume the active data synchronization between a source and target volume, without otherwise altering the replication relationship.",
+            "longDescription": "This action shall be used to resume the active data synchronization between a source and target volume, without otherwise altering the replication relationship.",
+            "parameters": {
+                "TargetVolume": {
+                    "description": "The Uri to the existing target volume.",
+                    "longDescription": "This parameter shall contain the Uri to the existing target volume.",
+                    "requiredParameter": true,
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "ReverseReplicationRelationship": {
+            "additionalProperties": false,
+            "description": "This action is used to reverse the replication relationship between a source and target volume.",
+            "longDescription": "This action shall be used to reverse the replication relationship between a source and target volume.",
+            "parameters": {
+                "TargetVolume": {
+                    "description": "The Uri to the existing target volume.",
+                    "longDescription": "This parameter shall contain the Uri to the existing target volume.",
+                    "requiredParameter": true,
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "SplitReplication": {
+            "additionalProperties": false,
+            "description": "This action is used to split the replication relationship and suspend data synchronization between a source and target volume.",
+            "longDescription": "This action shall be used to split the replication relationship and suspend data synchronization between a source and target volume.",
+            "parameters": {
+                "TargetVolume": {
+                    "description": "The Uri to the existing target volume.",
+                    "longDescription": "This parameter shall contain the Uri to the existing target volume.",
+                    "requiredParameter": true,
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "SuspendReplication": {
+            "additionalProperties": false,
+            "description": "This action is used to suspend active data synchronization between a source and target volume, without otherwise altering the replication relationship.",
+            "longDescription": "This action shall be used to suspend active data synchronization between a source and target volume, without otherwise altering the replication relationship.",
+            "parameters": {
+                "TargetVolume": {
+                    "description": "The Uri to the existing target volume.",
+                    "longDescription": "This parameter shall contain the Uri to the existing target volume.",
+                    "requiredParameter": true,
+                    "type": "string"
+                }
+            },
+            "patternProperties": {
+                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": {
+                    "description": "This property shall specify a valid odata or Redfish property.",
+                    "type": [
+                        "array",
+                        "boolean",
+                        "integer",
+                        "number",
+                        "null",
+                        "object",
+                        "string"
+                    ]
+                }
+            },
+            "properties": {
+                "target": {
+                    "description": "Link to invoke action",
+                    "format": "uri-reference",
+                    "type": "string"
+                },
+                "title": {
+                    "description": "Friendly action name",
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "Volume": {
             "additionalProperties": false,
             "description": "Volume contains properties used to describe a volume, virtual disk, LUN, or other logical storage entity for any system.",
             "longDescription": "This resource shall be used to represent a volume, virtual disk, logical disk, LUN, or other logical storage for a Redfish implementation.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -362,7 +692,8 @@
                     },
                     "longDescription": "Each entry shall specify a current storage access capability.",
                     "readonly": false,
-                    "type": "array"
+                    "type": "array",
+                    "versionAdded": "v1_1_0"
                 },
                 "Actions": {
                     "$ref": "#/definitions/Actions",
@@ -370,17 +701,11 @@
                     "longDescription": "The Actions property shall contain the available actions for this resource."
                 },
                 "AllocatedPools": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StoragePoolCollection.json#/definitions/StoragePoolCollection"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StoragePoolCollection.json#/definitions/StoragePoolCollection",
                     "description": "An array of references to StoragePools allocated from this Volume.",
                     "longDescription": "The value of this property shall contain references to all storage pools allocated from this volume.",
-                    "readonly": true
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
                 },
                 "BlockSizeBytes": {
                     "description": "The size of the smallest addressable unit (Block) of this volume in bytes.",
@@ -393,22 +718,15 @@
                     "units": "By"
                 },
                 "Capacity": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Capacity.json#/definitions/Capacity"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Capacity.v1_0_0.json#/definitions/Capacity",
                     "description": "Capacity utilization.",
                     "longDescription": "Information about the utilization of capacity allocated to this storage volume.",
-                    "readonly": false
+                    "versionAdded": "v1_1_0"
                 },
                 "CapacityBytes": {
                     "description": "The size in bytes of this Volume.",
                     "longDescription": "This property shall contain the size in bytes of the associated volume.",
-                    "readonly": true,
+                    "readonly": false,
                     "type": [
                         "integer",
                         "null"
@@ -416,17 +734,39 @@
                     "units": "By"
                 },
                 "CapacitySources": {
+                    "autoExpand": true,
                     "description": "An array of space allocations to this volume.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/Capacity.json#/definitions/CapacitySource"
                     },
                     "longDescription": "Fully or partially consumed storage from a source resource. Each entry provides capacity allocation information from a named source resource.",
                     "readonly": false,
-                    "type": "array"
+                    "type": "array",
+                    "versionAdded": "v1_1_0"
                 },
                 "CapacitySources@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
                 },
+                "Compressed": {
+                    "description": "Indicator of whether or not the Volume has compression enabled.",
+                    "longDescription": "This property shall contain a boolean indicator if the Volume is currently utilizing compression or not.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
+                "Deduplicated": {
+                    "description": "Indicator of whether or not the Volume has deduplication enabled.",
+                    "longDescription": "This property shall contain a boolean indicator if the Volume is currently utilizing deduplication or not.",
+                    "readonly": false,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
                 "Description": {
                     "anyOf": [
                         {
@@ -438,6 +778,16 @@
                     ],
                     "readonly": true
                 },
+                "DisplayName": {
+                    "description": "A user-configurable string to name the volume.",
+                    "longDescription": "This property shall contain a user-configurable string to name the volume.",
+                    "readonly": false,
+                    "type": [
+                        "string",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
                 "Encrypted": {
                     "description": "Is this Volume encrypted.",
                     "longDescription": "This property shall contain a boolean indicator if the Volume is currently utilizing encryption or not.",
@@ -457,16 +807,10 @@
                     "type": "array"
                 },
                 "IOStatistics": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics.json#/definitions/IOStatistics"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics.json#/definitions/IOStatistics",
                     "description": "Statistics for this volume.",
-                    "longDescription": "The value shall represent IO statistics for this volume."
+                    "longDescription": "The value shall represent IO statistics for this volume.",
+                    "versionAdded": "v1_2_0"
                 },
                 "Id": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id",
@@ -485,6 +829,16 @@
                     "description": "Contains references to other resources that are related to this resource.",
                     "longDescription": "The Links property, as described by the Redfish Specification, shall contain references to resources that are related to, but not contained by (subordinate to), this resource."
                 },
+                "LogicalUnitNumber": {
+                    "description": "Indicates the host-visible LogicalUnitNumber assigned to this Volume.",
+                    "longDescription": "This property shall contain host-visible LogicalUnitNumber assigned to this Volume. This property shall only be used when in a single connect configuration and no StorageGroup configuration is used.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
+                },
                 "LowSpaceWarningThresholdPercents": {
                     "description": "Low space warning.",
                     "items": {
@@ -496,7 +850,8 @@
                     "longDescription": "Each time the following value is less than one of the values in the array the LOW_SPACE_THRESHOLD_WARNING event shall be triggered: Across all CapacitySources entries, percent = (SUM(AllocatedBytes) - SUM(ConsumedBytes))/SUM(AllocatedBytes).",
                     "readonly": false,
                     "type": "array",
-                    "units": "%"
+                    "units": "%",
+                    "versionAdded": "v1_1_0"
                 },
                 "Manufacturer": {
                     "description": "The manufacturer or OEM of this storage volume.",
@@ -505,7 +860,8 @@
                     "type": [
                         "string",
                         "null"
-                    ]
+                    ],
+                    "versionAdded": "v1_1_0"
                 },
                 "MaxBlockSizeBytes": {
                     "description": "Max Block size in bytes.",
@@ -515,7 +871,18 @@
                         "integer",
                         "null"
                     ],
-                    "units": "By"
+                    "units": "By",
+                    "versionAdded": "v1_1_0"
+                },
+                "MediaSpanCount": {
+                    "description": "Indicates the number of media elements used per span in the secondary RAID for a hierarchical RAID type.",
+                    "longDescription": "This property shall indicate the number of media elements used per span in the secondary RAID for a hierarchical RAID type.",
+                    "readonly": true,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "versionAdded": "v1_4_0"
                 },
                 "Model": {
                     "description": "The model number for this storage volume.",
@@ -524,7 +891,8 @@
                     "type": [
                         "string",
                         "null"
-                    ]
+                    ],
+                    "versionAdded": "v1_1_0"
                 },
                 "Name": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name",
@@ -553,6 +921,20 @@
                     ],
                     "units": "By"
                 },
+                "ProvisioningPolicy": {
+                    "anyOf": [
+                        {
+                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/DataStorageLoSCapabilities.json#/definitions/ProvisioningPolicy"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "This property specifies the volume's storage allocation, or provisioning policy.",
+                    "longDescription": "This property shall specify the volume's supported storage allocation policy.",
+                    "readonly": false,
+                    "versionAdded": "v1_4_0"
+                },
                 "RAIDType": {
                     "anyOf": [
                         {
@@ -564,7 +946,22 @@
                     ],
                     "description": "The RAID type of this volume.",
                     "longDescription": "This property shall contain the RAID type of the associated Volume.",
-                    "readonly": true
+                    "readonly": true,
+                    "versionAdded": "v1_3_1"
+                },
+                "ReadCachePolicy": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/ReadCachePolicyType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Indicates the read cache policy setting for the Volume.",
+                    "longDescription": "This property shall contain a boolean indicator of the read cache policy for the Volume.",
+                    "readonly": false,
+                    "versionAdded": "v1_4_0"
                 },
                 "RecoverableCapacitySourceCount": {
                     "description": "Current number of capacity source resources that are available as replacements.",
@@ -573,29 +970,24 @@
                     "type": [
                         "integer",
                         "null"
-                    ]
+                    ],
+                    "versionAdded": "v1_3_0"
                 },
                 "RemainingCapacityPercent": {
-                    "description": "The percentage of the capacity remaining in the StoragePool.",
+                    "description": "The percentage of the capacity remaining in the Volume.",
                     "longDescription": "If present, this value shall return  {[(SUM(AllocatedBytes) - SUM(ConsumedBytes)]/SUM(AllocatedBytes)}*100 represented as an integer value.",
                     "readonly": true,
                     "type": [
                         "integer",
                         "null"
-                    ]
+                    ],
+                    "versionAdded": "v1_2_0"
                 },
                 "ReplicaInfo": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo.json#/definitions/ReplicaInfo"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo.v1_2_0.json#/definitions/ReplicaInfo",
                     "description": "Describes this storage volume in its role as a target replica.",
                     "longDescription": "This property shall describe the replica relationship between this storage volume and a corresponding source volume.",
-                    "readonly": true
+                    "versionAdded": "v1_1_0"
                 },
                 "ReplicaTargets": {
                     "description": "The resources that are target replicas of this source.",
@@ -604,26 +996,34 @@
                     },
                     "longDescription": "The value shall reference the target replicas that are sourced by this replica.",
                     "readonly": true,
-                    "type": "array"
+                    "type": "array",
+                    "versionAdded": "v1_3_0"
                 },
                 "ReplicaTargets@odata.count": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
                 },
                 "Status": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
+                    "description": "The property contains the status of the Volume.",
+                    "longDescription": "The property shall contain the status of the Volume."
                 },
                 "StorageGroups": {
-                    "anyOf": [
-                        {
-                            "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageGroupCollection.json#/definitions/StorageGroupCollection"
-                        },
-                        {
-                            "type": "null"
-                        }
-                    ],
+                    "$ref": "http://redfish.dmtf.org/schemas/swordfish/v1/StorageGroupCollection.json#/definitions/StorageGroupCollection",
                     "description": "An array of references to Storage Groups that includes this volume.",
                     "longDescription": "The value of this property shall contain references to all storage groups that include this volume.",
-                    "readonly": true
+                    "readonly": true,
+                    "versionAdded": "v1_1_0"
+                },
+                "StripSizeBytes": {
+                    "description": "The number of blocks (bytes) in a strip in a disk array that uses striped data mapping.",
+                    "longDescription": "The number of consecutively addressed virtual disk blocks (bytes) mapped to consecutively addressed blocks on a single member extent of a disk array. Synonym for stripe depth and chunk size.",
+                    "readonly": false,
+                    "type": [
+                        "integer",
+                        "null"
+                    ],
+                    "units": "By",
+                    "versionAdded": "v1_4_0"
                 },
                 "VolumeType": {
                     "anyOf": [
@@ -638,6 +1038,55 @@
                     "description": "The type of this volume.",
                     "longDescription": "This property shall contain the type of the associated Volume.",
                     "readonly": true
+                },
+                "VolumeUsage": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/VolumeUsageType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Indicates the Volume usage type setting for the Volume.",
+                    "longDescription": "This property shall contain the volume usage type for the Volume.",
+                    "readonly": true,
+                    "versionAdded": "v1_4_0"
+                },
+                "WriteCachePolicy": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/WriteCachePolicyType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Indicates the write cache policy setting for the Volume.",
+                    "longDescription": "This property shall contain a boolean indicator of the write cache policy for the Volume.",
+                    "readonly": false,
+                    "versionAdded": "v1_4_0"
+                },
+                "WriteCacheState": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/WriteCacheStateType"
+                        },
+                        {
+                            "type": "null"
+                        }
+                    ],
+                    "description": "Indicates the WriteCacheState policy setting for the Volume.",
+                    "longDescription": "This property shall contain the WriteCacheState policy setting for the Volume.",
+                    "readonly": true,
+                    "versionAdded": "v1_4_0"
+                },
+                "WriteHoleProtectionPolicy": {
+                    "$ref": "#/definitions/WriteHoleProtectionPolicyType",
+                    "description": "The policy that the RAID volume is using to address the write hole issue.",
+                    "longDescription": "This property specifies the policy that is enabled to address the write hole issue on the RAID volume. If no policy is enabled at the moment, this property shall be set to 'Off'.",
+                    "readonly": false,
+                    "versionAdded": "v1_4_0"
                 }
             },
             "required": [
@@ -666,8 +1115,89 @@
                 "StripedWithParity": "The volume is a device which uses parity to retain redundant information."
             },
             "type": "string"
+        },
+        "VolumeUsageType": {
+            "enum": [
+                "Data",
+                "SystemData",
+                "CacheOnly",
+                "SystemReserve",
+                "ReplicationReserve"
+            ],
+            "enumDescriptions": {
+                "CacheOnly": "The volume is allocated for use as a non-consumable cache only volume.",
+                "Data": "The volume is allocated for use as a consumable data volume.",
+                "ReplicationReserve": "The volume is allocated for use as a non-consumable reserved volume for replication use.",
+                "SystemData": "The volume is allocated for use as a consumable data volume reserved for system use.",
+                "SystemReserve": "The volume is allocated for use as a non-consumable system reserved volume."
+            },
+            "enumLongDescriptions": {
+                "CacheOnly": "The volume shall be allocated for use as a non-consumable cache only volume.",
+                "Data": "The volume shall be allocated for use as a consumable data volume.",
+                "ReplicationReserve": "The volume shall be allocated for use as a non-consumable reserved volume for replication use.",
+                "SystemData": "The volume shall be allocated for use as a consumable data volume reserved for system use.",
+                "SystemReserve": "The volume shall be allocated for use as a non-consumable system reserved volume."
+            },
+            "type": "string"
+        },
+        "WriteCachePolicyType": {
+            "enum": [
+                "WriteThrough",
+                "ProtectedWriteBack",
+                "UnprotectedWriteBack"
+            ],
+            "enumDescriptions": {
+                "ProtectedWriteBack": "A caching technique in which the completion of a write request is signaled as soon as the data is in cache, and actual writing to non-volatile media is guaranteed to occur at a later time.",
+                "UnprotectedWriteBack": "A caching technique in which the completion of a write request is signaled as soon as the data is in cache; actual writing to non-volatile media is not guaranteed to occur at a later time.",
+                "WriteThrough": "A caching technique in which the completion of a write request is not signaled until data is safely stored on non-volatile media."
+            },
+            "enumLongDescriptions": {
+                "ProtectedWriteBack": "A caching technique in which the completion of a write request is signaled as soon as the data is in cache, and actual writing to non-volatile media is guaranteed to occur at a later time.",
+                "UnprotectedWriteBack": "A caching technique in which the completion of a write request is signaled as soon as the data is in cache; actual writing to non-volatile media is not guaranteed to occur at a later time.",
+                "WriteThrough": "A caching technique in which the completion of a write request is not signaled until data is safely stored on non-volatile media."
+            },
+            "type": "string"
+        },
+        "WriteCacheStateType": {
+            "enum": [
+                "Unprotected",
+                "Protected",
+                "Degraded"
+            ],
+            "enumDescriptions": {
+                "Degraded": "Indicates an issue with the cache state in which the cache space is diminished or disabled due to a failure or an outside influence such as a discharged battery.",
+                "Protected": "Indicates that the cache state type in use generally protects write requests on non-volatile media.",
+                "Unprotected": "Indicates that the cache state type in use generally does not protect write requests on non-volatile media."
+            },
+            "enumLongDescriptions": {
+                "Degraded": "Indicates an issue with the cache state in which the cache space is diminished or disabled due to a failure or an outside influence such as a discharged battery.",
+                "Protected": "Indicates that the cache state type in use generally protects write requests on non-volatile media.",
+                "Unprotected": "Indicates that the cache state type in use generally does not protect write requests on non-volatile media."
+            },
+            "type": "string"
+        },
+        "WriteHoleProtectionPolicyType": {
+            "enum": [
+                "Off",
+                "Journaling",
+                "DistributedLog",
+                "Oem"
+            ],
+            "enumDescriptions": {
+                "DistributedLog": "The policy that distributes additional log among the volume's capacity sources to address write hole issue.",
+                "Journaling": "The policy that uses separate block device for write-ahead logging to adddress write hole issue.",
+                "Oem": "The policy that is Oem specific.",
+                "Off": "The volume is not using any policy to address the write hole issue."
+            },
+            "enumLongDescriptions": {
+                "DistributedLog": "The policy that distributes additional log (e.q. cheksum of the parity) among the volume's capacity sources to address write hole issue. Additional data is used to detect data corruption on the volume.",
+                "Journaling": "The policy that uses separate block device for write-ahead logging to adddress write hole issue. All write operations on the RAID volume are first logged on dedicated journaling device that is not part of the volume.",
+                "Oem": "The policy that is Oem specific. The mechanism details are unknown unless provided separatly by the Oem.",
+                "Off": "The support for addressing the write hole issue is disabled. The volume is not performing any additional activities to close the RAID write hole."
+            },
+            "type": "string"
         }
     },
     "owningEntity": "SNIA",
-    "title": "#Volume.v1_3_1.Volume"
+    "title": "#Volume.v1_4_0.Volume"
 }
\ No newline at end of file
diff --git a/static/redfish/v1/schema/ComputerSystem_v1.xml b/static/redfish/v1/schema/ComputerSystem_v1.xml
index d8c90be..22e5a69 100644
--- a/static/redfish/v1/schema/ComputerSystem_v1.xml
+++ b/static/redfish/v1/schema/ComputerSystem_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ComputerSystem v1.8.0                                               -->
+<!--# Redfish Schema:  ComputerSystem v1.9.0                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -1362,5 +1362,19 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ComputerSystem.v1_9_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+      <EntityType Name="ComputerSystem" BaseType="ComputerSystem.v1_8_0.ComputerSystem"/>
+      <ComplexType Name="Boot" BaseType="ComputerSystem.v1_6_0.Boot">
+        <Property Name="HttpBootUri" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The URI to boot from when BootSourceOverrideTarget is set to `UefiHttp`."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the URI to perform an HTTP or HTTPS boot when BootSourceOverrideTarget is set to `UefiHttp`."/>
+          <Annotation Term="OData.IsURL"/>
+        </Property>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Drive_v1.xml b/static/redfish/v1/schema/Drive_v1.xml
index a853d66..7be03b6 100644
--- a/static/redfish/v1/schema/Drive_v1.xml
+++ b/static/redfish/v1/schema/Drive_v1.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
-<!--################################################################################       -->
-<!--# Redfish Schema:  Drive v1.7.0                                                        -->
-<!--#                                                                                      -->
-<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
-<!--# available at http://www.dmtf.org/standards/redfish                                   -->
-<!--# Copyright 2014-2019 DMTF.                                                            -->
-<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
-<!--################################################################################       -->
+<!--################################################################################                   -->
+<!--# Redfish Schema:  Drive 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                                               -->
+<!--# Copyright 2014-2019 DMTF in cooperation with the Storage Networking Industry Association (SNIA). -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright             -->
+<!--################################################################################                   -->
 <!---->
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
 
@@ -48,6 +48,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/PCIeFunction_v1.xml">
     <edmx:Include Namespace="PCIeFunction"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StoragePool_v1.xml">
+    <edmx:Include Namespace="StoragePool"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -710,5 +713,21 @@
       </EntityType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Drive.v1_8_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+
+      <EntityType Name="Drive" BaseType="Drive.v1_7_0.Drive"/>
+
+      <ComplexType Name="Links" BaseType="Drive.v1_6_0.Links">
+        <NavigationProperty Name="StoragePools" Type="Collection(StoragePool.StoragePool)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of links to the storage pools to which this drive belongs."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links of type StoragePool to which this drive belongs."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </ComplexType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/EventDestination_v1.xml b/static/redfish/v1/schema/EventDestination_v1.xml
index f66fd2c..bbfe344 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.6.0                                             -->
+<!--# Redfish Schema:  EventDestination v1.7.0                                             -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -19,6 +19,7 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
     <edmx:Include Namespace="Resource"/>
@@ -97,7 +98,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."/>
+          <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.  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">
@@ -136,12 +137,60 @@
         <Member Name="Redfish">
           <Annotation Term="OData.Description" String="The destination follows the Redfish Specification for event notifications."/>
         </Member>
+        <Member Name="SNMPv1">
+          <Annotation Term="OData.Description" String="The destination follows the SNMPv1 protocol for event notifications."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the destination follows the RFC1157-defined SNMPv1 protocol."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="SNMPv2c">
+          <Annotation Term="OData.Description" String="The destination follows the SNMPv2c protocol for event notifications."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the destination follows the SNMPv2c protocol as defined by RFC1441 and RFC1452."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="SNMPv3">
+          <Annotation Term="OData.Description" String="The destination follows the SNMPv3 protocol for event notifications."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the destination follows the SNMPv3 protocol as defined by RFC3411 and RFC3418."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="SMTP">
+          <Annotation Term="OData.Description" String="The destination follows the SMTP specification for event notifications."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the destination follows the RFC5321-defined SMTP specification."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
 
       <ComplexType Name="HttpHeaderProperty">
         <Annotation Term="OData.AdditionalProperties" Bool="false"/>
         <Annotation Term="OData.Description" String="The HTTP header value is the property value.  The header name is the property name."/>
-        <Annotation Term="OData.LongDescription" String="This type shall contain the HTTP header name and value to include with every event POST to the event eestination."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the HTTP header name and value to include with every event POST to the event destination."/>
         <Annotation Term="Redfish.DynamicPropertyPatterns">
           <Collection>
             <Record>
@@ -331,6 +380,30 @@
         <Member Name="SSE">
           <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."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the subscription follows the various versions of SNMP Traps for event notifications.  EventDestinationProtocol shall specify the appropriate version of SNMP."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="SNMPInform">
+          <Annotation Term="OData.Description" String="The subscription follows versions 2 and 3 of SNMP Inform for event notifications."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the subscription follows versions 2 and 3 of SNMP Inform for event notifications.  EventDestinationProtocol shall specify the appropriate version of SNMP."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_7_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
     </Schema>
 
@@ -409,6 +482,7 @@
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.2"/>
       <Annotation Term="OData.Description" String="This version was created to add DeliveryRetryPolicy."/>
+
       <EntityType Name="EventDestination" BaseType="EventDestination.v1_5_0.EventDestination">
         <Property Name="DeliveryRetryPolicy" Type="EventDestination.v1_6_0.DeliveryRetryPolicy">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -439,5 +513,85 @@
       </EnumType>
     </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"/>
+      <Annotation Term="OData.Description" String="This version was created to add SMTP and SNMP to EventDestinationProtocol, and SNMP to SubscriptionType."/>
+
+      <EntityType Name="EventDestination" BaseType="EventDestination.v1_6_0.EventDestination">
+        <Property Name="SNMP" Type="EventDestination.v1_7_0.SNMPSettings" Nullable="false">
+          <Annotation Term="OData.Description" String="Settings for an SNMP event destination."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the settings for an SNMP event destination."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="SNMPSettings">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="Settings for an SNMP event destination."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain the settings for an SNMP event destination."/>
+        <Property Name="TrapCommunity" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The SNMP trap community string."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMP trap community string.  The value shall be `null` in responses."/>
+        </Property>
+        <Property Name="AuthenticationKey" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key used for SNMPv3 authentication.  The value shall be `null` in responses."/>
+          <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
+        </Property>
+        <Property Name="AuthenticationProtocol" Type="EventDestination.v1_7_0.SNMPAuthenticationProtocols">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The authentication protocol for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMPv3 authentication protocol."/>
+        </Property>
+        <Property Name="EncryptionKey" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses."/>
+          <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
+        </Property>
+        <Property Name="EncryptionProtocol" Type="EventDestination.v1_7_0.SNMPEncryptionProtocols">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The encryption protocol for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMPv3 encryption protocol."/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="SNMPAuthenticationProtocols">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication is not required."/>
+        </Member>
+        <Member Name="CommunityString">
+          <Annotation Term="OData.Description" String="Trap community string authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication using SNMP community strings and the value of TrapCommunity."/>
+        </Member>
+        <Member Name="HMAC_MD5">
+          <Annotation Term="OData.Description" String="HMAC-MD5-96 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol."/>
+        </Member>
+        <Member Name="HMAC_SHA96">
+          <Annotation Term="OData.Description" String="HMAC-SHA-96 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="SNMPEncryptionProtocols">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate there is no encryption."/>
+        </Member>
+        <Member Name="CBC_DES">
+          <Annotation Term="OData.Description" String="CBC-DES encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol."/>
+        </Member>
+        <Member Name="CFB128_AES128">
+          <Annotation Term="OData.Description" String="CFB128-AES-128 encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/EventService_v1.xml b/static/redfish/v1/schema/EventService_v1.xml
index 86f9928..30729e8 100644
--- a/static/redfish/v1/schema/EventService_v1.xml
+++ b/static/redfish/v1/schema/EventService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  EventService v1.4.0                                                 -->
+<!--# Redfish Schema:  EventService 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                                   -->
@@ -26,6 +26,7 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Event_v1.xml">
     <edmx:Include Namespace="Event"/>
@@ -416,5 +417,107 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="EventService.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+
+      <EntityType Name="EventService" BaseType="EventService.v1_4_0.EventService">
+        <Property Name="SMTP" Type="EventService.v1_5_0.SMTP" Nullable="false">
+          <Annotation Term="OData.Description" String="Settings for SMTP event delivery."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain settings for SMTP event delivery."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="SMTP">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="Settings for SMTP event delivery."/>
+        <Annotation Term="OData.LongDescription" String="This type shall contain settings for SMTP event delivery."/>
+        <Property Name="ServiceEnabled" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="An indication if SMTP for event delivery is enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if SMTP for event delivery is enabled."/>
+        </Property>
+        <Property Name="Port" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The destination SMTP port."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the destination port for the SMTP server."/>
+          <Annotation Term="Validation.Minimum" Int="0"/>
+          <Annotation Term="Validation.Maximum" Int="65535"/>
+        </Property> 
+        <Property Name="ServerAddress" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The address of the SMTP server."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the address of the SMTP server for outgoing email."/>
+        </Property>
+        <Property Name="FromAddress" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The 'from' email address of the outgoing email."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the email address to use for the 'from' field in an outgoing email."/>
+        </Property>
+        <Property Name="ConnectionProtocol" Type="EventService.v1_5_0.SMTPConnectionProtocol">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The connection type to the outgoing SMTP server."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the connection type to the outgoing SMTP server."/>
+        </Property>
+        <Property Name="Authentication" Type="EventService.v1_5_0.SMTPAuthenticationMethods">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The authentication method for the SMTP server."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the authentication method for the SMTP server."/>
+        </Property>
+        <Property Name="Username" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The username for authentication with the SMTP server."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the username for authentication with the SMTP server."/>
+        </Property>
+        <Property Name="Password" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The password for authentication with the SMTP server.  The value is `null` in responses."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the password for authentication with the SMTP server.  The value shall be `null` in responses."/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="SMTPConnectionProtocol">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="Clear text."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the connection is in clear text."/>
+        </Member>
+        <Member Name="AutoDetect">
+          <Annotation Term="OData.Description" String="Auto-detect."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the connection is auto-detected."/>
+        </Member>
+        <Member Name="StartTLS">
+          <Annotation Term="OData.Description" String="StartTLS."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the connection conforms to the RFC3207-defined StartTLS extension."/>
+        </Member>
+        <Member Name="TLS_SSL">
+          <Annotation Term="OData.Description" String="TLS/SSL."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the connection is TLS/SSL."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="SMTPAuthenticationMethods">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication is not required."/>
+        </Member>
+        <Member Name="AutoDetect">
+          <Annotation Term="OData.Description" String="Auto-detect."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication is auto-detected."/>
+        </Member>
+        <Member Name="Plain">
+          <Annotation Term="OData.Description" String="PLAIN authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC4954-defined AUTH PLAIN mechanism."/>
+        </Member>
+        <Member Name="Login">
+          <Annotation Term="OData.Description" String="LOGIN authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC4954-defined AUTH LOGIN mechanism."/>
+        </Member>
+        <Member Name="CRAM_MD5">
+          <Annotation Term="OData.Description" String="CRAM-MD5 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC4954-defined AUTH CRAM-MD5 mechanism."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/LogEntry_v1.xml b/static/redfish/v1/schema/LogEntry_v1.xml
index 67b5a22..8ed9392 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.4.2                                                     -->
+<!--# Redfish Schema:  LogEntry 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                                   -->
@@ -23,6 +23,7 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Event_v1.xml">
     <edmx:Include Namespace="Event"/>
@@ -116,7 +117,7 @@
         <Property Name="MessageId" Type="Edm.String" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The MessageId, event data, or OEM-specific information.  This property decodes from the entry type.  If the entry type is `Event`, this property contains a Redfish Specification-defined MessageId.  If the entry type is `SEL`, this property contains the Event Data.  Otherwise, this property contains OEM-specific information."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the MessageId, event data, or OEM-specific information.  This property decodes from the entry type.  If the entry type is `Event`, this property contains a Redfish Specification-defined MessageId property of the event.  If the entry type is `SEL`, this property contains the three IPMI Event Data bytes.  In this case, the format should follow the `^0[xX](([a-fA-F]|[0-9]){2}){3}$` pattern, where Event Data 1 is the first byte in the string, Event Data 2 is the second byte in the string, and Event Data 3 is the third byte in the string.  Otherwise, this property contains OEM-specific information."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the MessageId, event data, or OEM-specific information.  This property decodes from the entry type.  If the entry type is `Event`, this property contains a Redfish Specification-defined MessageId property of the event.  If the entry type is `SEL`, the format should follow the pattern '^0[xX](([a-fA-F]|[0-9]){2}){4}$', which results in a string in the form '0xNNaabbcc', where 'NN' is the EventDir/EventType byte, 'aa' is the Event Data 1 byte, 'bb' is Event Data 2 byte, 'cc' is Event Data 3 byte, corresponding with bytes 13-16 in the IPMI SEL Event Record.  Otherwise, this property contains OEM-specific information."/>
         </Property>
         <Property Name="MessageArgs" Type="Collection(Edm.String)" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -660,6 +661,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_0_8.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_0_10">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add the Event Type/Direction byte of the IPMI SEL to MessageId."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_0_9.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2016.2"/>
@@ -733,6 +740,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_1_6.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_1_8">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add the Event Type/Direction byte of the IPMI SEL to MessageId."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_1_7.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -790,6 +803,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_2_4.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_2_6">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add the Event Type/Direction byte of the IPMI SEL to MessageId."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_2_5.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -832,6 +851,12 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_3_3.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add the Event Type/Direction byte of the IPMI SEL to MessageId."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_3_4.LogEntry"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.2"/>
@@ -863,5 +888,27 @@
       <EntityType Name="LogEntry" BaseType="LogEntry.v1_4_2.LogEntry"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_4_4">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to add the Event Type/Direction byte of the IPMI SEL to MessageId."/>
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_4_3.LogEntry"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="LogEntry.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add the GeneratorId property."/>
+
+      <EntityType Name="LogEntry" BaseType="LogEntry.v1_4_4.LogEntry">
+        <Property Name="GeneratorId" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An identifier of the device that has generated the IPMI SEL Event Record."/>
+          <Annotation Term="OData.LongDescription" String="If EntryType is `SEL`, this property shall contain the 'Generator ID' field of the IPMI SEL Event Record.  If EntryType is not `SEL`, this property should not be present."/>
+          <Annotation Term="Validation.Pattern" String="^0[xX](([a-fA-F]|[0-9]){2}){2}$"/>
+        </Property>
+      </EntityType>
+    </Schema>
+
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ManagerAccount_v1.xml b/static/redfish/v1/schema/ManagerAccount_v1.xml
index 04a3ab0..6f8f2ed 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.3.1                                               -->
+<!--# Redfish Schema:  ManagerAccount v1.4.0                                               -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -19,6 +19,7 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
     <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/>
+    <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml">
     <edmx:Include Namespace="Resource"/>
@@ -115,7 +116,6 @@
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
       </ComplexType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_0_2">
@@ -266,5 +266,98 @@
       <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_3_0.ManagerAccount"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerAccount.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+
+      <EntityType Name="ManagerAccount" BaseType="ManagerAccount.v1_3_0.ManagerAccount">
+        <Property Name="SNMP" Type="ManagerAccount.v1_4_0.SNMPUserInfo">
+          <Annotation Term="OData.Description" String="The SNMP settings for this account."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMP settings for this account when AccountTypes contains `SNMP`."/>
+        </Property>
+        <Property Name="AccountTypes" Type="Collection(ManagerAccount.v1_4_0.AccountTypes)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The account types."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the various account types that apply to the account.  If this property is not provided by the client, the default value shall be an array with the single value `Redfish`."/>
+          <Annotation Term="Redfish.Required"/>
+        </Property>
+        <Property Name="OEMAccountTypes" Type="Collection(Edm.String)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The OEM account types."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the OEM account types for this account.  This property shall be valid when AccountTypes contains `OEM`."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="SNMPUserInfo">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The SNMP settings for an account."/>
+        <Annotation Term="OData.LongDescription" String="This object shall contain the SNMP settings for an account."/>
+        <Property Name="AuthenticationKey" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The secret authentication key for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 authentication.  The value shall be `null` in responses."/>
+          <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
+        </Property>
+        <Property Name="AuthenticationProtocol" Type="ManagerAccount.v1_4_0.SNMPAuthenticationProtocols">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The authentication protocol for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMPv3 authentication protocol."/>
+        </Property>
+        <Property Name="EncryptionKey" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The secret authentication key used in SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the key for SNMPv3 encryption.  The value shall be `null` in responses."/>
+          <Annotation Term="Validation.Pattern" String="(^[A-Za-z0-9]+$)|(^\*+$)"/>
+        </Property>
+        <Property Name="EncryptionProtocol" Type="ManagerAccount.v1_4_0.SNMPEncryptionProtocols">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The encryption protocol for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMPv3 encryption protocol."/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="AccountTypes">
+        <Member Name="Redfish">
+          <Annotation Term="OData.Description" String="Allow access to the Redfish Service."/>
+        </Member>
+        <Member Name="SNMP">
+          <Annotation Term="OData.Description" String="Allow access to SNMP services."/>
+        </Member>
+        <Member Name="OEM">
+          <Annotation Term="OData.Description" String="OEM account type."/>
+        </Member> 
+      </EnumType>
+
+      <EnumType Name="SNMPAuthenticationProtocols">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication is not required."/>
+        </Member>
+        <Member Name="HMAC_MD5">
+          <Annotation Term="OData.Description" String="HMAC-MD5-96 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol."/>
+        </Member>
+        <Member Name="HMAC_SHA96">
+          <Annotation Term="OData.Description" String="HMAC-SHA-96 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="SNMPEncryptionProtocols">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate there is no encryption."/>
+        </Member>
+        <Member Name="CBC_DES">
+          <Annotation Term="OData.Description" String="CBC-DES encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol."/>
+        </Member>
+        <Member Name="CFB128_AES128">
+          <Annotation Term="OData.Description" String="CFB128-AES-128 encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml b/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml
index c02ec47..e0b2f62 100644
--- a/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml
+++ b/static/redfish/v1/schema/ManagerNetworkProtocol_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  ManagerNetworkProtocol v1.4.2                                       -->
+<!--# Redfish Schema:  ManagerNetworkProtocol 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                                   -->
@@ -88,7 +88,7 @@
           <Annotation Term="OData.Description" String="The settings for this manager's HTTPS protocol support."/>
           <Annotation Term="OData.LongDescription" String="This object shall contain the HTTPS/SSL protocol settings for this manager.  The default Port property value should be `443` for compatibility with established client implementations."/>
         </Property>
-        <Property Name="SNMP" Type="ManagerNetworkProtocol.v1_0_0.Protocol" Nullable="false">
+        <Property Name="SNMP" Type="ManagerNetworkProtocol.v1_0_0.SNMPProtocol" Nullable="false">
           <Annotation Term="OData.Description" String="The settings for this manager's SNMP support."/>
           <Annotation Term="OData.LongDescription" String="This object shall contain the SNMP protocol settings for this manager.  The default Port property value should be `161` for compatibility with established client implementations."/>
         </Property>
@@ -163,6 +163,8 @@
 
       <ComplexType Name="HTTPSProtocol" BaseType="ManagerNetworkProtocol.v1_0_0.Protocol"/>
 
+      <ComplexType Name="SNMPProtocol" BaseType="ManagerNetworkProtocol.v1_0_0.Protocol"/>
+
       <EnumType Name="NotifyIPv6Scope">
         <Member Name="Link">
           <Annotation Term="OData.Description" String="SSDP NOTIFY messages are sent to addresses in the IPv6 local link scope."/>
@@ -174,7 +176,6 @@
           <Annotation Term="OData.Description" String="SSDP NOTIFY messages are sent to addresses in the IPv6 local organization scope."/>
         </Member>
       </EnumType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_0_2">
@@ -364,5 +365,147 @@
       <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_4_1.ManagerNetworkProtocol"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ManagerNetworkProtocol.v1_5_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+
+      <EntityType Name="ManagerNetworkProtocol" BaseType="ManagerNetworkProtocol.v1_4_2.ManagerNetworkProtocol"/>
+
+      <ComplexType Name="SNMPProtocol" BaseType="ManagerNetworkProtocol.v1_0_0.SNMPProtocol">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Property Name="EnableSNMPv1" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if access via SNMPv1 is enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if access to the SNMP service on this manager using the SNMPv1 protocol is enabled."/>
+        </Property>
+        <Property Name="EnableSNMPv2c" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if access via SNMPv2c is enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if access to the SNMP service on this manager using the SNMPv2c protocol is enabled."/>
+        </Property>
+        <Property Name="EnableSNMPv3" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if access via SNMPv3 is enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if access to the SNMP service on this manager using the SNMPv3 protocol is enabled."/>
+        </Property>
+        <Property Name="CommunityStrings" Type="Collection(ManagerNetworkProtocol.v1_5_0.SNMPCommunity)">
+          <Annotation Term="OData.Description" String="The SNMP community strings."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an array of the SNMP community strings used to access an SNMP manager."/>
+        </Property>
+        <Property Name="CommunityAccessMode" Type="ManagerNetworkProtocol.v1_5_0.SNMPCommunityAccessMode">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The access level of the SNMP community."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the access/privilege level of the SNMP community used to access an SNMP manager."/>
+        </Property>
+        <Property Name="EngineId" Type="ManagerNetworkProtocol.v1_5_0.EngineId">
+          <Annotation Term="OData.Description" String="The engine ID."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the RFC3411-defined engine ID."/>
+        </Property>
+        <Property Name="HideCommunityStrings" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates if the community strings should be hidden."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate if the community strings should be hidden in responses."/>
+        </Property>
+        <Property Name="AuthenticationProtocol" Type="ManagerNetworkProtocol.v1_5_0.SNMPAuthenticationProtocols">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The authentication protocol for SNMP."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMP authentication protocol."/>
+        </Property>
+        <Property Name="EncryptionProtocol" Type="ManagerNetworkProtocol.v1_5_0.SNMPEncryptionProtocols">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The encryption protocol for SNMPv3."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMPv3 encryption protocol."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="SNMPCommunity">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="An SNMP community strings."/>
+        <Annotation Term="OData.LongDescription" String="This object shall contain an SNMP community string used to access an SNMP manager."/>
+        <Property Name="Name" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The name of the SNMP community."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a display name describing the SNMP community."/>
+        </Property>
+        <Property Name="CommunityString" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The SNMP community string."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the SNMP community string used for accessing an SNMP service on this manager.  If HideCommunityStrings is `true`, this value shall be `null` in responses."/>
+        </Property>
+        <Property Name="AccessMode" Type="ManagerNetworkProtocol.v1_5_0.SNMPCommunityAccessMode">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The access level of the SNMP community."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the access/privilege level of the SNMP community used to access an SNMP manager."/>
+        </Property>
+      </ComplexType>
+
+      <ComplexType Name="EngineId">
+        <Annotation Term="OData.AdditionalProperties" Bool="false"/>
+        <Annotation Term="OData.Description" String="The engine ID."/>
+        <Annotation Term="OData.LongDescription" String="This object shall contain the RFC3411-defined engine ID."/>
+        <Property Name="PrivateEnterpriseId" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The private enterprise ID."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an RFC3411-defined private enterprise ID."/>
+          <Annotation Term="Validation.Pattern" String="^([A-Fa-f0-9]{2} ){3}[A-Fa-f0-9]{2}$"/>
+        </Property>
+        <Property Name="EnterpriseSpecificMethod" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The enterprise specific method."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain an RFC3411-defined enterprise specific method."/>
+          <Annotation Term="Validation.Pattern" String="^([A-Fa-f0-9]{2} ){7}[A-Fa-f0-9]{2}$"/>
+        </Property>
+      </ComplexType>
+
+      <EnumType Name="SNMPCommunityAccessMode">
+        <Member Name="Full">
+          <Annotation Term="OData.Description" String="READ-WRITE access mode."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the RFC1157-defined READ-WRITE access mode."/>
+        </Member>
+        <Member Name="Limited">
+          <Annotation Term="OData.Description" String="READ-ONLY access mode."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the RFC1157-defined READ-ONLY access mode."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="SNMPAuthenticationProtocols">
+        <Member Name="Account">
+          <Annotation Term="OData.Description" String="Authentication is determined by account settings."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access is determined based on the corresponding account settings."/>
+        </Member>
+        <Member Name="CommunityString">
+          <Annotation Term="OData.Description" String="SNMP community string authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication uses SNMP community strings."/>
+        </Member>
+        <Member Name="HMAC_MD5">
+          <Annotation Term="OData.Description" String="HMAC-MD5-96 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC3414-defined HMAC-MD5-96 authentication protocol."/>
+        </Member>
+        <Member Name="HMAC_SHA96">
+          <Annotation Term="OData.Description" String="HMAC-SHA-96 authentication."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate authentication for SNMPv3 access conforms to the RFC3414-defined HMAC-SHA-96 authentication protocol."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="SNMPEncryptionProtocols">
+        <Member Name="None">
+          <Annotation Term="OData.Description" String="No encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate there is no encryption."/>
+        </Member>
+        <Member Name="Account">
+          <Annotation Term="OData.Description" String="Encryption is determined by account settings."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption is determined based on the corresponding account settings."/>
+        </Member>
+        <Member Name="CBC_DES">
+          <Annotation Term="OData.Description" String="CBC-DES encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption conforms to the RFC3414-defined CBC-DES encryption protocol."/>
+        </Member>
+        <Member Name="CFB128_AES128">
+          <Annotation Term="OData.Description" String="CFB128-AES-128 encryption."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate encryption conforms to the RFC3414-defined CFB128-AES-128 encryption protocol."/>
+        </Member>
+      </EnumType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Power_v1.xml b/static/redfish/v1/schema/Power_v1.xml
index 20f501c..dfa6282 100644
--- a/static/redfish/v1/schema/Power_v1.xml
+++ b/static/redfish/v1/schema/Power_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Power v1.5.4                                                        -->
+<!--# Redfish Schema:  Power v1.6.0                                                        -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -69,6 +69,27 @@
         </Annotation>
       </EntityType>
 
+      <Action Name="PowerSupplyReset" IsBound="true">
+        <Parameter Name="Power" Type="Power.v1_3_0.Actions"/>
+        <Parameter Name="ResetType" Type="Resource.ResetType">
+          <Annotation Term="OData.Description" String="The type of reset."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the type of reset.  The Service may accept a request without the parameter and shall perform a `GracefulRestart`."/>
+        </Parameter>
+        <Parameter Name="MemberId" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The MemberId of the power supply within the PowerSupplies array on which to perform the reset."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the identifier of the member within the PowerSupplies array on which to perform the reset."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action resets the targeted power supply."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset a power supply specified by the MemberId from the PowerSupplies array.  A `GracefulRestart` ResetType shall reset the power supply but shall not affect the power output.  A `ForceRestart` ResetType may affect the power supply output."/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_6_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_0_0">
@@ -1016,5 +1037,12 @@
       <EntityType Name="Power" BaseType="Power.v1_5_3.Power"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Power.v1_6_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+      <EntityType Name="Power" BaseType="Power.v1_5_4.Power"/>
+      <Annotation Term="OData.Description" String="This version was created to add a reset action for individual power supplies."/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Privileges_v1.xml b/static/redfish/v1/schema/Privileges_v1.xml
index fc842db..34d003c 100644
--- a/static/redfish/v1/schema/Privileges_v1.xml
+++ b/static/redfish/v1/schema/Privileges_v1.xml
@@ -34,11 +34,15 @@
           <Annotation Term="OData.Description" String="Can configure users and their accounts."/>
         </Member>
         <Member Name="ConfigureSelf">
-          <Annotation Term="OData.Description" String="Can change the password for the current user account."/>
+          <Annotation Term="OData.Description" String="Can change the password for the current user account and log out of their own sessions."/>
         </Member>
         <Member Name="ConfigureComponents">
           <Annotation Term="OData.Description" String="Can configure components that this service manages."/>
         </Member>
+        <Member Name="NoAuth">
+          <Annotation Term="OData.Description" String="Authentication is not required."/>
+          <Annotation Term="OData.LongDescription" String="This value shall be used to indicate an operation does not require authentication.  This privilege shall not be used in Redfish Roles."/>
+        </Member>
       </EnumType>
 
     </Schema>
diff --git a/static/redfish/v1/schema/Processor_v1.xml b/static/redfish/v1/schema/Processor_v1.xml
index 2567d28..819806b 100644
--- a/static/redfish/v1/schema/Processor_v1.xml
+++ b/static/redfish/v1/schema/Processor_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Processor v1.5.1                                                    -->
+<!--# Redfish Schema:  Processor v1.6.0                                                    -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -95,6 +95,24 @@
         </Annotation>
       </EntityType>
 
+      <Action Name="Reset" IsBound="true">
+        <Parameter Name="Processor" Type="Processor.v1_1_0.Actions"/>
+        <Parameter Name="ResetType" Type="Resource.ResetType">
+          <Annotation Term="OData.Description" String="The type of reset."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the type of reset.  The Service may accept a request without the parameter and perform an implementation specific default reset."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action resets the processor."/>
+        <Annotation Term="OData.LongDescription" String="This action shall reset the processor."/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_6_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
+
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_0_0">
@@ -170,8 +188,8 @@
         </Property>
         <Property Name="IdentificationRegisters" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The raw manufacturer-provided CPUID instruction output for this processor."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the raw manufacturer-provided CPUID instruction output for this processor."/>
+          <Annotation Term="OData.Description" String="The raw manufacturer-provided processor identification registers for this processor."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the raw manufacturer-provided processor-specific identification registers of this processor's features."/>
         </Property>
         <Property Name="EffectiveFamily" Type="Edm.String">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
@@ -372,6 +390,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_0_7.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_0_9">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description of IdentificationRegisters."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_0_8.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_1_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.1"/>
@@ -438,6 +462,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_1_3.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_1_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description of IdentificationRegisters."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_1_4.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2017.3"/>
@@ -479,6 +509,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_2_3.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_2_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description of IdentificationRegisters."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_2_4.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.1"/>
@@ -516,6 +552,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_3_3.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_3_5">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description of IdentificationRegisters."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_3_4.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_4_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2018.3"/>
@@ -860,6 +902,12 @@
       <EntityType Name="Processor" BaseType="Processor.v1_4_1.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_4_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description of IdentificationRegisters."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_4_2.Processor"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_5_0">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
       <Annotation Term="Redfish.Release" String="2019.1"/>
@@ -872,7 +920,7 @@
           <Annotation Term="OData.LongDescription" String="This property shall indicate the total count of enabled independent processor cores contained within this processor."/>
         </Property>
       </EntityType>
-   </Schema>
+    </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_5_1">
       <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
@@ -880,5 +928,18 @@
       <EntityType Name="Processor" BaseType="Processor.v1_5_0.Processor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_5_2">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to update the description of IdentificationRegisters."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_5_1.Processor"/>
+    </Schema>
+
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Processor.v1_6_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add a reset action for a processor."/>
+      <EntityType Name="Processor" BaseType="Processor.v1_5_2.Processor"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Protocol_v1.xml b/static/redfish/v1/schema/Protocol_v1.xml
index 2210998..deb31b5 100644
--- a/static/redfish/v1/schema/Protocol_v1.xml
+++ b/static/redfish/v1/schema/Protocol_v1.xml
@@ -169,6 +169,42 @@
             </Collection>
           </Annotation>
         </Member>
+        <Member Name="TCP">
+          <Annotation Term="OData.Description" String="Transmission Control Protocol (TCP)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the IETF-defined Tranmission Control Protocol (TCP).  For example, RFC7414 defines the roadmap of the TCP specification."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2019.3"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="UDP">
+          <Annotation Term="OData.Description" String="User Datagram Protocol (UDP)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the IETF-defined User Datagram Protocol (UDP).  For example, RFC768 defines the core UDP specification."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2019.3"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
+        <Member Name="TFTP">
+          <Annotation Term="OData.Description" String="Trivial File Transfer Protocol (TFTP)."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to the IETF-defined Trivial File Transfer Protocol (TFTP).  For example, RFC1350 defines the core TFTP version 2 specification."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="2019.3"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
         <Member Name="OEM">
           <Annotation Term="OData.Description" String="OEM-specific."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate conformance to an OEM-specific architecture and additional information may be included in the OEM section."/>
diff --git a/static/redfish/v1/schema/Resource_v1.xml b/static/redfish/v1/schema/Resource_v1.xml
index cae1993..3a447e6 100644
--- a/static/redfish/v1/schema/Resource_v1.xml
+++ b/static/redfish/v1/schema/Resource_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Resource v1.8.2                                                     -->
+<!--# Redfish Schema:  Resource v1.8.3                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -308,7 +308,6 @@
         <Property Name="Name" Type="Resource.Name" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="Redfish.Required"/>
-          <Annotation Term="Redfish.Excerpt"/>
         </Property>
       </EntityType>
 
@@ -1147,5 +1146,10 @@
       <Annotation Term="OData.Description" String="This version was created to update descriptions that this schema defines."/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Resource.v1_8_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to remove the Redfish Excerpt annotation from the Name property, prior to the first publication of schemas containing Excerpt usage."/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Sensor_v1.xml b/static/redfish/v1/schema/Sensor_v1.xml
index d4f6a49..26020d3 100644
--- a/static/redfish/v1/schema/Sensor_v1.xml
+++ b/static/redfish/v1/schema/Sensor_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Sensor v1.0.2                                                       -->
+<!--# Redfish Schema:  Sensor v1.0.3                                                       -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -111,19 +111,18 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The area or device to which this sensor measurement applies."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a description of the affected component or region within the equipment to which this sensor measurement applies."/>
-          <Annotation Term="Redfish.Excerpt"/>
+          <Annotation Term="Redfish.Excerpt" String="Array"/>
         </Property>
         <Property Name="PhysicalSubContext" Type="PhysicalContext.PhysicalSubContext">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The usage or location within a device to which this sensor measurement applies."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a description of the usage or sub-region within the equipment to which this sensor measurement applies.  This property generally differentiates multiple sensors within the same PhysicalContext instance."/>
-          <Annotation Term="Redfish.Excerpt"/>
+          <Annotation Term="Redfish.Excerpt" String="Array"/>
         </Property>
         <Property Name="PeakReading" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The peak sensor value."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the peak sensor value since the last ResetStatistics action was performed or the service last reset the time-based property values."/>
-          <Annotation Term="Redfish.Excerpt"/>
         </Property>
 
         <Property Name="MaxAllowableOperatingValue" Type="Edm.Decimal">
@@ -149,14 +148,16 @@
 
         <Property Name="ApparentVA" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The product of voltage and current for an AC circuit, in Volt-Amperes units."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  PowerApparentVA is expressed in Volt-Amperes units by using the ReadingUnits `V` value.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/>
+          <Annotation Term="OData.Description" String="The product of voltage and current for an AC circuit, in Volt-Ampere units."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the product of VoltageRMS multiplied by CurrentRMS for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/>
+          <Annotation Term="Measures.Unit" String="V.A"/>
           <Annotation Term="Redfish.Excerpt" String="Power"/>
         </Property>
         <Property Name="ReactiveVAR" Type="Edm.Decimal">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in VAR units."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  PowerReactiveVAR is expressed in VAR units by using the ReadingUnits `V` value.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/>
+          <Annotation Term="OData.Description" String="The square root of the difference term of squared ApparentVA and squared Power (Reading) for a circuit, in var units."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the arithmetic mean of product terms of instantaneous voltage and quadrature current measurements calculated over an integer number of line cycles for a circuit.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/>
+          <Annotation Term="Measures.Unit" String="V.A"/>
           <Annotation Term="Redfish.Excerpt" String="Power"/>
         </Property>
         <Property Name="PowerFactor" Type="Edm.Decimal">
@@ -172,7 +173,6 @@
           <Annotation Term="OData.Description" String="The power load utilization for this sensor."/>
           <Annotation Term="OData.LongDescription" String="This property shall indicate the power load utilization percent for this sensor.  This property may appear in sensors of the Power ReadingType, and shall not appear in sensors of other ReadingType values."/>
           <Annotation Term="Measures.Unit" String="%"/>
-          <Annotation Term="Redfish.Excerpt" String="Power"/>
         </Property>
 
         <Property Name="Location" Type="Resource.Location" Nullable="false">
@@ -477,5 +477,11 @@
       <EntityType Name="Sensor" BaseType="Sensor.v1_0_1.Sensor"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Sensor.v1_0_3">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="OData.Description" String="This version was created to remove the excerpt annotation from the LoadPercent and PeakReading properties, and to provide a specific excerpt type for PhysicalContext and PhysicalSubContext.  It was also created to add unit annotations for ApparentVA and ReactiveVAR properties."/>
+      <EntityType Name="Sensor" BaseType="Sensor.v1_0_2.Sensor"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Settings_v1.xml b/static/redfish/v1/schema/Settings_v1.xml
index b589f66..afb4ce5 100644
--- a/static/redfish/v1/schema/Settings_v1.xml
+++ b/static/redfish/v1/schema/Settings_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  Settings v1.2.2                                                     -->
+<!--# Redfish Schema:  Settings v1.3.0                                                     -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -62,6 +62,18 @@
           <Annotation Term="OData.Description" String="The requested operation is applied after a reset but within the administrator-specified maintenance window."/>
           <Annotation Term="OData.LongDescription" String="This value shall indicate the requested create, delete, or action operation is applied during the maintenance window that the MaintenanceWindowStartTime and MaintenanceWindowDurationInSeconds properties specify, and if a reset occurs within the maintenance window."/>
         </Member>
+        <Member Name="OnStartUpdateRequest">
+          <Annotation Term="OData.Description" String="The requested operation is applied when the StartUpdate action of the Update Service is invoked."/>
+          <Annotation Term="OData.LongDescription" String="This value shall indicate the requested create, delete, or action operation is applied when the StartUpdate action of the Update Service is invoked."/>
+          <Annotation Term="Redfish.Revisions">
+            <Collection>
+              <Record>
+                <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+                <PropertyValue Property="Version" String="v1_3_0"/>
+              </Record>
+            </Collection>
+          </Annotation>
+        </Member>
       </EnumType>
     </Schema>
 
@@ -273,5 +285,15 @@
       <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_2_1.MaintenanceWindow"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Settings.v1_3_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add the OnStartUpdateRequest value to the OperationApplyTime enumeration."/>
+      <ComplexType Name="Settings" BaseType="Settings.v1_2_2.Settings"/>
+      <ComplexType Name="PreferredApplyTime" BaseType="Settings.v1_2_2.PreferredApplyTime"/>
+      <ComplexType Name="OperationApplyTimeSupport" BaseType="Settings.v1_2_2.OperationApplyTimeSupport"/>
+      <ComplexType Name="MaintenanceWindow" BaseType="Settings.v1_2_2.MaintenanceWindow"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Storage_v1.xml b/static/redfish/v1/schema/Storage_v1.xml
index a56ac6b..59b2ad1 100644
--- a/static/redfish/v1/schema/Storage_v1.xml
+++ b/static/redfish/v1/schema/Storage_v1.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
-<!--################################################################################       -->
-<!--# Redfish Schema:  Storage v1.7.1                                                      -->
-<!--#                                                                                      -->
-<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
-<!--# available at http://www.dmtf.org/standards/redfish                                   -->
-<!--# Copyright 2014-2019 DMTF.                                                            -->
-<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
-<!--################################################################################       -->
+<!--################################################################################                   -->
+<!--# Redfish Schema:  Storage 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                                               -->
+<!--# Copyright 2014-2019 DMTF in cooperation with the Storage Networking Industry Association (SNIA). -->
+<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright             -->
+<!--################################################################################                   -->
 <!---->
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
 
@@ -64,6 +64,21 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/Volume_v1.xml">
     <edmx:Include Namespace="Volume"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/FileSystemCollection_v1.xml">
+    <edmx:Include Namespace="FileSystemCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StoragePoolCollection_v1.xml">
+    <edmx:Include Namespace="StoragePoolCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StorageGroupCollection_v1.xml">
+    <edmx:Include Namespace="StorageGroupCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/EndpointGroupCollection_v1.xml">
+    <edmx:Include Namespace="EndpointGroupCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/ConsistencyGroupCollection_v1.xml">
+    <edmx:Include Namespace="ConsistencyGroupCollection"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -656,5 +671,43 @@
       <EntityType Name="Storage" BaseType="Storage.v1_7_0.Storage"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Storage.v1_8_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+
+      <EntityType Name="Storage" BaseType="Storage.v1_7_1.Storage">
+        <NavigationProperty Name="FileSystems" Type="FileSystemCollection.FileSystemCollection" Nullable="false" ContainsTarget="true">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="All filesystems that are allocated by this storage subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a Resource of type FileSystemCollection.  This property shall be used when file systems are shared or exported by the storage subsystem."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="StoragePools" Type="StoragePoolCollection.StoragePoolCollection" Nullable="false" ContainsTarget="true">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The set of all storage pools that are allocated by this storage subsystem.  A storage pool is the set of storage capacity that can be used to produce volumes or other storage pools."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a Resource of type StoragePoolCollection.  This property shall be used when an abstraction of media, rather than references to individual media, are used as the storage data source."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="StorageGroups" Type="StorageGroupCollection.StorageGroupCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="All of the storage groups, each of which contains a set of volumes and endpoints that are managed as a group for mapping and masking, that belong to this storage subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a Resource of type StorageGroupsCollection.  This property shall be used when implementing mapping and masking."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="EndpointGroups" Type="EndpointGroupCollection.EndpointGroupCollection" Nullable="false" ContainsTarget="true">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="All of the endpoint groups, each of which contains a set of endpoints that are used for a common purpose such as an ACL or logical identification, that belong to this storage subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a Resource of type EndpointGroupCollection.  This property shall be implemented when atomic control is needed to perform mapping, masking and zoning operations."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="ConsistencyGroups" Type="ConsistencyGroupCollection.ConsistencyGroupCollection" ContainsTarget="true" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="The consistency groups, each of which contains a set of volumes that are treated by an application or set of applications as a single resource, that are managed by this storage subsystem."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a link to a Resource of type ConsistencyGroupCollection.  The property shall be used when groups of volumes are treated as a single resource by an application or set of applications."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+      </EntityType>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/UpdateService_v1.xml b/static/redfish/v1/schema/UpdateService_v1.xml
index 0c5bf0a..3f377bf 100644
--- a/static/redfish/v1/schema/UpdateService_v1.xml
+++ b/static/redfish/v1/schema/UpdateService_v1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
 <!--################################################################################       -->
-<!--# Redfish Schema:  UpdateService v1.6.0                                                -->
+<!--# Redfish Schema:  UpdateService v1.7.0                                                -->
 <!--#                                                                                      -->
 <!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
 <!--# available at http://www.dmtf.org/standards/redfish                                   -->
@@ -115,6 +115,20 @@
           </Annotation>
         </Parameter>
       </Action>
+
+      <Action Name="StartUpdate" IsBound="true">
+        <Annotation Term="OData.Description" String="This action starts an update of software components."/>
+        <Annotation Term="OData.LongDescription" String="This action shall start an update of software component that have been scheduled with the OperationApplyTime value of `OnStartUpdateRequest`."/>
+        <Parameter Name="UpdateService" Type="UpdateService.v1_0_0.Actions"/>
+        <Annotation Term="Redfish.Revisions">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Kind" EnumMember="Redfish.RevisionKind/Added"/>
+              <PropertyValue Property="Version" String="v1_7_0"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Action>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_0_0">
@@ -515,5 +529,12 @@
       </ComplexType>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="UpdateService.v1_7_0">
+      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
+      <Annotation Term="Redfish.Release" String="2019.3"/>
+      <Annotation Term="OData.Description" String="This version was created to add the StartUpdate action."/>
+      <EntityType Name="UpdateService" BaseType="UpdateService.v1_6_0.UpdateService"/>
+    </Schema>
+
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/VolumeCollection_v1.xml b/static/redfish/v1/schema/VolumeCollection_v1.xml
index 7ffb225..e16a31d 100644
--- a/static/redfish/v1/schema/VolumeCollection_v1.xml
+++ b/static/redfish/v1/schema/VolumeCollection_v1.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
-<!--################################################################################       -->
-<!--# Redfish Schema:  VolumeCollection                                                    -->
-<!--#                                                                                      -->
-<!--# For a detailed change log, see the README file contained in the DSP8010 bundle,      -->
-<!--# available at http://www.dmtf.org/standards/redfish                                   -->
-<!--# Copyright 2014-2019 DMTF.                                                            -->
-<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright -->
-<!--################################################################################       -->
-<!---->
+<!-- Copyright 2015-2019 Storage Networking Industry Association (SNIA), USA. All rights reserved.-->
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
 
   <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
@@ -26,19 +18,17 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/Volume_v1.xml">
     <edmx:Include Namespace="Volume"/>
   </edmx:Reference>
-
   <edmx:DataServices>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="VolumeCollection">
-      <Annotation Term="Redfish.OwningEntity" String="DMTF"/>
-
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <EntityType Name="VolumeCollection" BaseType="Resource.v1_0_0.ResourceCollection">
-        <Annotation Term="OData.Description" String="The VolumeCollection schema describes a collection of volume instances."/>
-        <Annotation Term="OData.LongDescription" String="This Resource shall represent a Resource Collection of Volume instances for a Redfish implementation."/>
+        <Annotation Term="OData.Description" String="A Collection of Volume resource instances."/>
+        <Annotation Term="OData.LongDescription" String="This collection shall contain references to all Volume resource instances sharing the same parent resource."/>
         <Annotation Term="Capabilities.InsertRestrictions">
           <Record>
             <PropertyValue Property="Insertable" Bool="true"/>
-            <Annotation Term="OData.Description" String="Create volumes through a POST to the volume collection."/>
+            <Annotation Term="OData.Description" String="Volume collections may support adding Volume resources by clients."/>
           </Record>
         </Annotation>
         <Annotation Term="Capabilities.UpdateRestrictions">
@@ -53,23 +43,32 @@
         </Annotation>
         <Annotation Term="Redfish.Uris">
           <Collection>
-            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Volumes</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Volumes</String>
             <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Volumes</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Volumes</String>
             <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Volumes</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/ConsistencyGroups/{ConsistencyGroupId}/Volumes</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/FileSystems/{FileSystemId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StoragePools/{StoragePoolId}/AllocatedVolumes</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StoragePools/{StoragePoolId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Volumes</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/ConsistencyGroups/{ConsistencyGroupId}/Volumes</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/FileSystems/{FileSystemId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/StoragePools/{StoragePoolId}/AllocatedVolumes</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/StoragePools/{StoragePoolId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/Volumes</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/Volumes/{VolumeId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes</String>
           </Collection>
         </Annotation>
         <NavigationProperty Name="Members" Type="Collection(Volume.Volume)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="An array of links to the members of this collection."/>
-          <Annotation Term="OData.LongDescription" String="This property shall contain an array of links to the members of this Resource Collection."/>
+          <Annotation Term="OData.Description" String="The value of each member references a Volume resource."/>
+          <Annotation Term="OData.LongDescription" String="The value of each member entry shall reference a Volume resource."/>
           <Annotation Term="OData.AutoExpandReferences"/>
           <Annotation Term="Redfish.Required"/>
         </NavigationProperty>
       </EntityType>
 
     </Schema>
-
   </edmx:DataServices>
 </edmx:Edmx>
diff --git a/static/redfish/v1/schema/Volume_v1.xml b/static/redfish/v1/schema/Volume_v1.xml
index f1a16f3..731586d 100644
--- a/static/redfish/v1/schema/Volume_v1.xml
+++ b/static/redfish/v1/schema/Volume_v1.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!---->
-<!-- Copyright 2015-2018 Storage Networking Industry Association (SNIA), USA. All rights reserved.-->
+<!-- Copyright 2015-2019 Storage Networking Industry Association (SNIA), USA, in cooperation with the DMTF. All rights reserved.-->
 <!---->
 
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
 
-  <edmx:Reference Uri="http://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml">
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml">
     <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/>
   </edmx:Reference>
-  <edmx:Reference Uri="http://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml">
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml">
     <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/>
   </edmx:Reference>
-  <edmx:Reference Uri="http://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Measures.V1.xml">
+  <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml">
     <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml">
@@ -27,6 +27,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Task_v1.xml">
     <edmx:Include Namespace="Task"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Endpoint_v1.xml">
+    <edmx:Include Namespace="Endpoint"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/DataStorageLoSCapabilities_v1.xml">
     <edmx:Include Namespace="DataStorageLoSCapabilities"/>
   </edmx:Reference>
@@ -35,6 +38,7 @@
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/Capacity_v1.xml">
     <edmx:Include Namespace="Capacity"/>
+    <edmx:Include Namespace="Capacity.v1_0_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StoragePoolCollection_v1.xml">
     <edmx:Include Namespace="StoragePoolCollection"/>
@@ -42,8 +46,18 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StorageGroupCollection_v1.xml">
     <edmx:Include Namespace="StorageGroupCollection"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StorageGroup_v1.xml">
+    <edmx:Include Namespace="StorageGroup"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/ConsistencyGroupCollection_v1.xml">
+    <edmx:Include Namespace="ConsistencyGroupCollection"/>
+  </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/ConsistencyGroup_v1.xml">
+    <edmx:Include Namespace="ConsistencyGroup"/>
+  </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StorageReplicaInfo_v1.xml">
     <edmx:Include Namespace="StorageReplicaInfo"/>
+    <edmx:Include Namespace="StorageReplicaInfo.v1_2_0"/>
   </edmx:Reference>
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/IOStatistics_v1.xml">
     <edmx:Include Namespace="IOStatistics"/>
@@ -51,6 +65,9 @@
   <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/SpareResourceSet_v1.xml">
     <edmx:Include Namespace="SpareResourceSet"/>
   </edmx:Reference>
+  <edmx:Reference Uri="http://redfish.dmtf.org/schemas/swordfish/v1/StorageService_v1.xml">
+    <edmx:Include Namespace="StorageService"/>
+  </edmx:Reference>
 
   <edmx:DataServices>
 
@@ -59,6 +76,42 @@
       <EntityType Name="Volume" BaseType="Resource.v1_0_0.Resource" Abstract="true">
         <Annotation Term="OData.Description" String="Volume contains properties used to describe a volume, virtual disk, LUN, or other logical storage entity for any system."/>
         <Annotation Term="OData.LongDescription" String="This resource shall be used to represent a volume, virtual disk, logical disk, LUN, or other logical storage for a Redfish implementation."/>
+        <Annotation Term="Capabilities.InsertRestrictions">
+          <Record>
+            <PropertyValue Property="Insertable" Bool="false"/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.UpdateRestrictions">
+          <Record>
+            <PropertyValue Property="Updatable" Bool="true"/>
+            <Annotation Term="OData.Description" String="Volumes can be updated to change the writable properties."/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Capabilities.DeleteRestrictions">
+          <Record>
+            <PropertyValue Property="Deletable" Bool="true"/>
+            <Annotation Term="OData.Description" String="Volumes can be deleted by deleting the Volume resource."/>
+          </Record>
+        </Annotation>
+        <Annotation Term="Redfish.Uris">
+          <Collection>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Volumes/{VolumeId}</String>
+            <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Volumes/{VolumeId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Storage/{StorageId}/Volumes/{VolumeId}</String>
+            <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Storage/{StorageId}/Volumes/{VolumeId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/ConsistencyGroups/{ConsistencyGroupId}/Volumes/{VolumeId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/FileSystems/{FileSystemId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes/{VolumeId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StoragePools/{StoragePoolId}/AllocatedVolumes/{VolumeId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/StoragePools/{StoragePoolId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes/{VolumeId}</String>
+            <String>/redfish/v1/Systems/{ComputerSystemId}/Storage/{StorageId}/Volumes/{VolumeId}</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/ConsistencyGroups/{ConsistencyGroupId}/Volumes/{VolumeId}</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/FileSystems/{FileSystemId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes/{VolumeId}</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/StoragePools/{StoragePoolId}/AllocatedVolumes/{VolumeId}</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/StoragePools/{StoragePoolId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes/{VolumeId}</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/Volumes/{VolumeId}</String>
+            <String>/redfish/v1/StorageServices/{StorageServiceId}/Volumes/{VolumeId}/CapacitySources/{CapacitySourceId}/ProvidingVolumes/{VolumeId}</String>
+          </Collection>
+        </Annotation>
       </EntityType>
 
       <Action Name="Initialize" IsBound="true">
@@ -89,66 +142,111 @@
       <EnumType Name="RAIDType">
         <Member Name="RAID0">
           <Annotation Term="OData.Description" String="A placement policy where consecutive logical blocks of data are uniformly distributed across a set of independent storage devices without offering any form of redundancy."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy where consecutive logical blocks of data are uniformly distributed across a set of independent storage devices without offering any form of redundancy. This is commonly referred to as data striping. This form of RAID will encounter data loss with the failure of any storage device in the set."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy where consecutive logical blocks of data are uniformly distributed across a set of independent storage devices without offering any form of redundancy. This is commonly referred to as data striping. This form of RAID will encounter data loss with the failure of any storage device in the set."/>
         </Member>
         <Member Name="RAID1">
           <Annotation Term="OData.Description" String="A placement policy where each logical block of data is stored on more than one independent storage device."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy where each logical block of data is stored on more than one independent storage device. This is commonly referred to as mirroring. Data stored using this form of RAID is able to survive a single storage device failure without data loss."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy where each logical block of data is stored on more than one independent storage device. This is commonly referred to as mirroring. Data stored using this form of RAID is able to survive a single storage device failure without data loss."/>
         </Member>
         <Member Name="RAID3">
-          <Annotation Term="OData.Description" String="A placement policy using parity-based protection where logical bytes of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy using parity-based protection where logical bytes of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device. Data stored using this form of RAID is able to survive a single storage device failure without data loss. If the storage devices use rotating media, they are assumed to be rotationally synchronized, and the data stripe size should be no larger than the exported block size."/>
+          <Annotation
+            Term="OData.Description"
+            String="A placement policy using parity-based protection where logical bytes of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy using parity-based protection where logical bytes of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device. Data stored using this form of RAID is able to survive a single storage device failure without data loss. If the storage devices use rotating media, they are assumed to be rotationally synchronized, and the data stripe size should be no larger than the exported block size."/>
         </Member>
         <Member Name="RAID4">
-          <Annotation Term="OData.Description" String="A placement policy using parity-based protection where logical blocks of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy using parity-based protection where logical blocks of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device. Data stored using this form of RAID is able to survive a single storage device failure without data loss."/>
+          <Annotation
+            Term="OData.Description"
+            String="A placement policy using parity-based protection where logical blocks of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy using parity-based protection where logical blocks of data are uniformly distributed across a set of independent storage devices and where the parity is stored on a dedicated independent storage device. Data stored using this form of RAID is able to survive a single storage device failure without data loss."/>
         </Member>
         <Member Name="RAID5">
-          <Annotation Term="OData.Description" String="A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and one logical block of parity across a set of 'n+1' independent storage devices where the parity and data blocks are interleaved across the storage devices."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and one logical block of parity across a set of 'n+1' independent storage devices where the parity and data blocks are interleaved across the storage devices. Data stored using this form of RAID is able to survive a single storage device failure without data loss."/>
+          <Annotation
+            Term="OData.Description"
+            String="A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and one logical block of parity across a set of 'n+1' independent storage devices where the parity and data blocks are interleaved across the storage devices."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and one logical block of parity across a set of 'n+1' independent storage devices where the parity and data blocks are interleaved across the storage devices. Data stored using this form of RAID is able to survive a single storage device failure without data loss."/>
         </Member>
         <Member Name="RAID6">
-          <Annotation Term="OData.Description" String="A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and two logical blocks of independent parity across a set of 'n+2' independent storage devices where the parity and data blocks are interleaved across the storage devices."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and two logical blocks of independent parity across a set of 'n+2' independent storage devices where the parity and data blocks are interleaved across the storage devices. Data stored using this form of RAID is able to survive any two independent storage device failures without data loss."/>
+          <Annotation
+            Term="OData.Description"
+            String="A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and two logical blocks of independent parity across a set of 'n+2' independent storage devices where the parity and data blocks are interleaved across the storage devices."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy using parity-based protection for storing stripes of 'n' logical blocks of data and two logical blocks of independent parity across a set of 'n+2' independent storage devices where the parity and data blocks are interleaved across the storage devices. Data stored using this form of RAID is able to survive any two independent storage device failures without data loss."/>
         </Member>
         <Member Name="RAID10">
           <Annotation Term="OData.Description" String="A placement policy that creates a striped device (RAID 0) over a set of mirrored devices (RAID 1)."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy that creates a striped device (RAID 0) over a set of mirrored devices (RAID 1). This is commonly referred to as RAID 1/0. Data stored using this form of RAID is able to survive storage device failures in each RAID 1 set without data loss."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy that creates a striped device (RAID 0) over a set of mirrored devices (RAID 1). This is commonly referred to as RAID 1/0. Data stored using this form of RAID is able to survive storage device failures in each RAID 1 set without data loss."/>
         </Member>
         <Member Name="RAID01">
           <Annotation Term="OData.Description" String="A data placement policy that creates a mirrored device (RAID 1) over a set of striped devices (RAID 0)."/>
-          <Annotation Term="OData.LongDescription" String="A data placement policy that creates a mirrored device (RAID 1) over a set of striped devices (RAID 0). This is commonly referred to as RAID 0+1 or RAID 0/1. Data stored using this form of RAID is able to survive a single RAID 0 data set failure without data loss."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A data placement policy that creates a mirrored device (RAID 1) over a set of striped devices (RAID 0). This is commonly referred to as RAID 0+1 or RAID 0/1. Data stored using this form of RAID is able to survive a single RAID 0 data set failure without data loss."/>
         </Member>
         <Member Name="RAID6TP">
-          <Annotation Term="OData.Description" String="A placement policy that uses parity-based protection for storing stripes of 'n' logical blocks of data and three logical blocks of independent parity across a set of 'n+3' independent storage devices where the parity and data blocks are interleaved across the storage devices. This is commonly referred to as Triple Parity RAID. Data stored using this form of RAID is able to survive any three independent storage device failures without data loss."/>
+          <Annotation
+            Term="OData.Description"
+            String="A placement policy that uses parity-based protection for storing stripes of 'n' logical blocks of data and three logical blocks of independent parity across a set of 'n+3' independent storage devices where the parity and data blocks are interleaved across the storage devices."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy that uses parity-based protection for storing stripes of 'n' logical blocks of data and three logical blocks of independent parity across a set of 'n+3' independent storage devices where the parity and data blocks are interleaved across the storage devices. This is commonly referred to as Triple Parity RAID. Data stored using this form of RAID is able to survive any three independent storage device failures without data loss."/>
         </Member>
         <Member Name="RAID1E">
-          <Annotation Term="OData.Description" String="A placement policy that uses a form of mirroring implemented over a set of independent storage devices where logical blocks are duplicated on a pair of independent storage devices so that data is uniformly distributed across the storage devices."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy that uses a form of mirroring implemented over a set of independent storage devices where logical blocks are duplicated on a pair of independent storage devices so that data is uniformly distributed across the storage devices. This is commonly referred to as RAID 1 Enhanced. Data stored using this form of RAID is able to survive a single storage device failure without data loss."/>
+          <Annotation
+            Term="OData.Description"
+            String="A placement policy that uses a form of mirroring implemented over a set of independent storage devices where logical blocks are duplicated on a pair of independent storage devices so that data is uniformly distributed across the storage devices."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy that uses a form of mirroring implemented over a set of independent storage devices where logical blocks are duplicated on a pair of independent storage devices so that data is uniformly distributed across the storage devices. This is commonly referred to as RAID 1 Enhanced. Data stored using this form of RAID is able to survive a single storage device failure without data loss."/>
         </Member>
         <Member Name="RAID50">
           <Annotation Term="OData.Description" String="A placement policy that uses a RAID 0 stripe set over two or more RAID 5 sets of independent storage devices."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy that uses a RAID 0 stripe set over two or more RAID 5 sets of independent storage devices. Data stored using this form of RAID is able to survive a single storage device failure within each RAID 5 set without data loss."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy that uses a RAID 0 stripe set over two or more RAID 5 sets of independent storage devices. Data stored using this form of RAID is able to survive a single storage device failure within each RAID 5 set without data loss."/>
         </Member>
         <Member Name="RAID60">
           <Annotation Term="OData.Description" String="A placement policy that uses a RAID 0 stripe set over two or more RAID 6 sets of independent storage devices."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy that uses a RAID 0 stripe set over two or more RAID 6 sets of independent storage devices. Data stored using this form of RAID is able to survive two device failures within each RAID 6 set without data loss."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy that uses a RAID 0 stripe set over two or more RAID 6 sets of independent storage devices. Data stored using this form of RAID is able to survive two device failures within each RAID 6 set without data loss."/>
         </Member>
         <Member Name="RAID00">
           <Annotation Term="OData.Description" String="A placement policy that creates a RAID 0 stripe set over two or more RAID 0 sets."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy that creates a RAID 0 stripe set over two or more RAID 0 sets. This is commonly referred to as RAID 0+0. This form of data layout is not fault tolerant; if any storage device fails there will be data loss."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy that creates a RAID 0 stripe set over two or more RAID 0 sets. This is commonly referred to as RAID 0+0. This form of data layout is not fault tolerant; if any storage device fails there will be data loss."/>
         </Member>
         <Member Name="RAID10E">
           <Annotation Term="OData.Description" String="A placement policy that uses a RAID 0 stripe set over two or more RAID 10 sets."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy that uses a RAID 0 stripe set over two or more RAID 10 sets. This is commonly referred to as Enhanced RAID 10. Data stored using this form of RAID is able to survive a single device failure within each nested RAID 1 set without data loss."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy that uses a RAID 0 stripe set over two or more RAID 10 sets. This is commonly referred to as Enhanced RAID 10. Data stored using this form of RAID is able to survive a single device failure within each nested RAID 1 set without data loss."/>
         </Member>
         <Member Name="RAID1Triple">
           <Annotation Term="OData.Description" String="A placement policy where each logical block of data is mirrored three times across a set of three independent storage devices."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy where each logical block of data is mirrored three times across a set of three independent storage devices. This is commonly referred to as three-way mirroring. This form of RAID can survive two device failures without data loss."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy where each logical block of data is mirrored three times across a set of three independent storage devices. This is commonly referred to as three-way mirroring. This form of RAID can survive two device failures without data loss."/>
         </Member>
         <Member Name="RAID10Triple">
           <Annotation Term="OData.Description" String="A placement policy that uses a striped device (RAID 0) over a set of triple mirrored devices (RAID 1Triple)."/>
-          <Annotation Term="OData.LongDescription" String="A placement policy that uses a striped device (RAID 0) over a set of triple mirrored devices (RAID 1Triple). This form of RAID can survive up to two failures in each triple mirror set without data loss. "/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="A placement policy that uses a striped device (RAID 0) over a set of triple mirrored devices (RAID 1Triple). This form of RAID can survive up to two failures in each triple mirror set without data loss."/>
         </Member>
       </EnumType>
     </Schema>
@@ -156,9 +254,12 @@
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_0_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <EntityType Name="Volume" BaseType="Volume.Volume">
-        <Property Name="Status" Type="Resource.Status" Nullable="false"/>
+        <Property Name="Status" Type="Resource.Status" Nullable="false">
+          <Annotation Term="OData.Description" String="The property contains the status of the Volume."/>
+          <Annotation Term="OData.LongDescription" String="The property shall contain the status of the Volume."/>
+        </Property>
         <Property Name="CapacityBytes" Type="Edm.Int64">
-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="The size in bytes of this Volume."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain the size in bytes of the associated volume."/>
           <Annotation Term="Measures.Unit" String="By"/>
@@ -311,14 +412,13 @@
           <Annotation Term="OData.Description" String="Supported IO access capabilities."/>
           <Annotation Term="OData.LongDescription" String="Each entry shall specify a current storage access capability."/>
         </Property>
-        <Property Name="MaxBlockSizeBytes" Type="Edm.Int32">
+        <Property Name="MaxBlockSizeBytes" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="Max Block size in bytes."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain size of the largest addressable unit of this storage volume."/>
           <Annotation Term="Measures.Unit" String="By"/>
         </Property>
-        <Property Name="Capacity" Type="Capacity.Capacity">
-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+        <Property Name="Capacity" Type="Capacity.v1_0_0.Capacity" Nullable="false">
           <Annotation Term="OData.Description" String="Capacity utilization."/>
           <Annotation Term="OData.LongDescription" String="Information about the utilization of capacity allocated to this storage volume."/>
         </Property>
@@ -326,6 +426,7 @@
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
           <Annotation Term="OData.Description" String="An array of space allocations to this volume."/>
           <Annotation Term="OData.LongDescription" String="Fully or partially consumed storage from a source resource. Each entry provides capacity allocation information from a named source resource."/>
+          <Annotation Term="OData.AutoExpand"/>
         </NavigationProperty>
         <Property Name="LowSpaceWarningThresholdPercents" Type="Collection(Edm.Int64)">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
@@ -345,18 +446,17 @@
           <Annotation Term="OData.Description" String="The model number for this storage volume."/>
           <Annotation Term="OData.LongDescription" String="The value is assigned by the manufacturer and shall represents a specific storage volume implementation."/>
         </Property>
-        <Property Name="ReplicaInfo" Type="StorageReplicaInfo.ReplicaInfo">
-          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+        <Property Name="ReplicaInfo" Type="StorageReplicaInfo.v1_2_0.ReplicaInfo" Nullable="false">
           <Annotation Term="OData.Description" String="Describes this storage volume in its role as a target replica."/>
           <Annotation Term="OData.LongDescription" String="This property shall describe the replica relationship between this storage volume and a corresponding source volume."/>
         </Property>
-        <NavigationProperty Name="StorageGroups" Type="StorageGroupCollection.StorageGroupCollection" ContainsTarget="true">
+        <NavigationProperty Name="StorageGroups" Type="StorageGroupCollection.StorageGroupCollection" Nullable="false" ContainsTarget="true">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="An array of references to Storage Groups that includes this volume."/>
           <Annotation Term="OData.LongDescription" String="The value of this property shall contain references to all storage groups that include this volume."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
-        <NavigationProperty Name="AllocatedPools" Type="StoragePoolCollection.StoragePoolCollection" ContainsTarget="true">
+        <NavigationProperty Name="AllocatedPools" Type="StoragePoolCollection.StoragePoolCollection" Nullable="false" ContainsTarget="true">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="An array of references to StoragePools allocated from this Volume."/>
           <Annotation Term="OData.LongDescription" String="The value of this property shall contain references to all storage pools allocated from this volume."/>
@@ -365,14 +465,13 @@
       </EntityType>
 
       <ComplexType Name="Links" BaseType="Volume.v1_0_0.Links">
-        <NavigationProperty Name="ClassOfService" Type="ClassOfService.ClassOfService">
+        <NavigationProperty Name="ClassOfService" Type="ClassOfService.ClassOfService" Nullable="false">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
           <Annotation Term="OData.Description" String="The ClassOfService that this storage volume conforms to."/>
           <Annotation Term="OData.LongDescription" String="This property shall contain a reference to the ClassOfService that this storage volume conforms to."/>
           <Annotation Term="OData.AutoExpandReferences"/>
         </NavigationProperty>
       </ComplexType>
-
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_1_1">
@@ -395,19 +494,25 @@
       <EntityType Name="Volume" BaseType="Volume.v1_1_2.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_1_4">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="OData.Description" String="This version was created to fix CSDL errors and adds both Redfish Uris and Capability Annotations."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_1_3.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_2_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
       <Annotation Term="OData.Description" String="This version was created to add IO Statistics, and adds the RemainingCapacityPercent property."/>
       <EntityType Name="Volume" BaseType="Volume.v1_1_1.Volume">
         <Annotation Term="OData.Description" String="Add volume statistics."/>
 
-        <Property Name="IOStatistics" Type="IOStatistics.IOStatistics">
+        <Property Name="IOStatistics" Type="IOStatistics.IOStatistics" Nullable="false">
           <Annotation Term="OData.Description" String="Statistics for this volume."/>
           <Annotation Term="OData.LongDescription" String="The value shall represent IO statistics for this volume."/>
         </Property>
         <Property Name="RemainingCapacityPercent" Type="Edm.Int64">
           <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
-          <Annotation Term="OData.Description" String="The percentage of the capacity remaining in the StoragePool."/>
+          <Annotation Term="OData.Description" String="The percentage of the capacity remaining in the Volume."/>
           <Annotation Term="OData.LongDescription" String="If present, this value shall return  {[(SUM(AllocatedBytes) - SUM(ConsumedBytes)]/SUM(AllocatedBytes)}*100 represented as an integer value."/>
         </Property>
       </EntityType>
@@ -429,7 +534,7 @@
       <Annotation
         Term="OData.Description"
         String="This version was created to show name change from Operations to Operation. The  description and long description for action Initialize have been extended to add a default InitializeType == Fast recommendation. Change references to unversioned."/>
-        <EntityType Name="Volume" BaseType="Volume.v1_2_0.Volume"/>
+      <EntityType Name="Volume" BaseType="Volume.v1_2_0.Volume"/>
     </Schema>
 
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_2_2">
@@ -438,9 +543,17 @@
       <EntityType Name="Volume" BaseType="Volume.v1_2_1.Volume"/>
     </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_2_3">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="OData.Description" String="This version was created to fix CSDL errors and adds both Redfish Uris and Capability Annotations."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_2_2.Volume"/>
+    </Schema>
+
     <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_3_0">
       <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
-      <Annotation Term="OData.Description" String="This version was created to add RecoverableCapacitySourceCount and SpareResourceSets. This also replaces collection StorageReplicaInfos with scalar StorageReplicaInfo, and adds a ReplicaTargets collection. It also adds the RAIDType enum, which replaces the use of VolumeType for direct Volume characterization."/>
+      <Annotation
+        Term="OData.Description"
+        String="This version was created to add RecoverableCapacitySourceCount and SpareResourceSets. This also replaces collection StorageReplicaInfos with scalar StorageReplicaInfo, and adds a ReplicaTargets collection. It also adds the RAIDType enum, which replaces the use of VolumeType for direct Volume characterization."/>
 
       <EntityType Name="Volume" BaseType="Volume.v1_2_1.Volume">
         <Annotation Term="OData.Description" String="Add ability to manage spare capacity."/>
@@ -482,6 +595,296 @@
       </EntityType>
     </Schema>
 
-  </edmx:DataServices>
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_3_2">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation Term="OData.Description" String="This version was created to fix CSDL errors and adds both Redfish Uris and Capability Annotations."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_3_1.Volume"/>
+    </Schema>
 
+    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Volume.v1_4_0">
+      <Annotation Term="Redfish.OwningEntity" String="SNIA"/>
+      <Annotation
+        Term="OData.Description"
+        String="This version was created to add collection of references to Endpoints, StorageGroups and ConsistencyGroups associated with this Volume, and adds a LongDescription to RAID6TP. It also adds AutoExpand to CapacitySources and changes the MaxBlockSizeBytes to 64 bytes. Additionally the following properties have been added: ProvisioningPolicy, OwningStorageService, StripSizeBytes, ReadAheadPolicy, VolumeUsage, WritePolicy, CacheState, LogicalUnitNumber, MediaSpanCount, Deduplicated, Compressed, WriteHoleProtectionPolicy, and DisplayName. This version also adds the following Actions: AssignReplicaTarget, CreateReplicaTarget, RemoveReplicaRelationship, ResumeReplication, ReverseReplicationRelationship, SplitReplication, and SuspendReplication. This version also adds both Redfish Uris and Capability Annotations and fixes CSDL errors."/>
+      <EntityType Name="Volume" BaseType="Volume.v1_3_1.Volume">
+        <Property Name="ProvisioningPolicy" Type="DataStorageLoSCapabilities.ProvisioningPolicy">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="This property specifies the volume's storage allocation, or provisioning policy."/>
+          <Annotation Term="OData.LongDescription" String="This property shall specify the volume's supported storage allocation policy."/>
+        </Property>
+        <Property Name="StripSizeBytes" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The number of blocks (bytes) in a strip in a disk array that uses striped data mapping."/>
+          <Annotation Term="OData.LongDescription" String="The number of consecutively addressed virtual disk blocks (bytes) mapped to consecutively addressed blocks on a single member extent of a disk array. Synonym for stripe depth and chunk size."/>
+          <Annotation Term="Measures.Unit" String="By"/>
+        </Property>
+        <Property Name="ReadCachePolicy" Type="Volume.v1_4_0.ReadCachePolicyType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the read cache policy setting for the Volume."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a boolean indicator of the read cache policy for the Volume."/>
+        </Property>
+        <Property Name="VolumeUsage" Type="Volume.v1_4_0.VolumeUsageType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates the Volume usage type setting for the Volume."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the volume usage type for the Volume."/>
+        </Property>
+        <Property Name="WriteCachePolicy" Type="Volume.v1_4_0.WriteCachePolicyType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicates the write cache policy setting for the Volume."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a boolean indicator of the write cache policy for the Volume."/>
+        </Property>
+        <Property Name="WriteCacheState" Type="Volume.v1_4_0.WriteCacheStateType">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates the WriteCacheState policy setting for the Volume."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain the WriteCacheState policy setting for the Volume."/>
+        </Property>
+        <Property Name="LogicalUnitNumber" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates the host-visible LogicalUnitNumber assigned to this Volume."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain host-visible LogicalUnitNumber assigned to this Volume. This property shall only be used when in a single connect configuration and no StorageGroup configuration is used."/>
+        </Property>
+        <Property Name="MediaSpanCount" Type="Edm.Int64">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="Indicates the number of media elements used per span in the secondary RAID for a hierarchical RAID type."/>
+          <Annotation Term="OData.LongDescription" String="This property shall indicate the number of media elements used per span in the secondary RAID for a hierarchical RAID type."/>
+        </Property>
+        <Property Name="DisplayName" Type="Edm.String">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="A user-configurable string to name the volume."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a user-configurable string to name the volume."/>
+        </Property>
+        <Property Name="WriteHoleProtectionPolicy" Type="Volume.v1_4_0.WriteHoleProtectionPolicyType" DefaultValue="Off" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="The policy that the RAID volume is using to address the write hole issue."/>
+          <Annotation Term="OData.LongDescription" String="This property specifies the policy that is enabled to address the write hole issue on the RAID volume. If no policy is enabled at the moment, this property shall be set to 'Off'."/>
+        </Property>
+        <Property Name="Deduplicated" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicator of whether or not the Volume has deduplication enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a boolean indicator if the Volume is currently utilizing deduplication or not."/>
+        </Property>
+        <Property Name="Compressed" Type="Edm.Boolean">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/ReadWrite"/>
+          <Annotation Term="OData.Description" String="Indicator of whether or not the Volume has compression enabled."/>
+          <Annotation Term="OData.LongDescription" String="This property shall contain a boolean indicator if the Volume is currently utilizing compression or not."/>
+        </Property>
+      </EntityType>
+
+      <ComplexType Name="Links" BaseType="Volume.v1_3_0.Links">
+        <Annotation Term="OData.Description" String="Add collection of references to Endpoints and StorageGroups associated with this Volume."/>
+        <NavigationProperty Name="ClientEndpoints" Type="Collection(Endpoint.Endpoint)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of references to the client Endpoints associated with this volume."/>
+          <Annotation Term="OData.LongDescription" String="The value of this property shall be references to the client Endpoints this volume is associated with."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="ServerEndpoints" Type="Collection(Endpoint.Endpoint)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of references to the server Endpoints associated with this volume."/>
+          <Annotation Term="OData.LongDescription" String="The value of this property shall be references to the server Endpoints this volume is associated with."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="StorageGroups" Type="Collection(StorageGroup.StorageGroup)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of references to the StorageGroups associated with this volume."/>
+          <Annotation Term="OData.LongDescription" String="The value of this property shall be references to the StorageGroups this volume is associated with."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="ConsistencyGroups" Type="Collection(ConsistencyGroup.ConsistencyGroup)">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="An array of references to the ConsistencyGroups associated with this volume."/>
+          <Annotation Term="OData.LongDescription" String="The value of this property shall be references to the ConsistencyGroups this volume is associated with."/>
+          <Annotation Term="OData.AutoExpandReferences"/>
+        </NavigationProperty>
+        <NavigationProperty Name="OwningStorageService" Type="StorageService.StorageService" Nullable="false">
+          <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/>
+          <Annotation Term="OData.Description" String="A pointer to the StorageService that owns or contains this volume."/>
+          <Annotation Term="OData.LongDescription" String="This shall be a pointer to the StorageService that owns or contains this volume."/>
+        </NavigationProperty>
+      </ComplexType>
+
+      <EnumType Name="WriteHoleProtectionPolicyType">
+        <Member Name="Off">
+          <Annotation Term="OData.Description" String="The volume is not using any policy to address the write hole issue."/>
+          <Annotation Term="OData.LongDescription" String="The support for addressing the write hole issue is disabled. The volume is not performing any additional activities to close the RAID write hole."/>
+        </Member>
+        <Member Name="Journaling">
+          <Annotation Term="OData.Description" String="The policy that uses separate block device for write-ahead logging to adddress write hole issue."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="The policy that uses separate block device for write-ahead logging to adddress write hole issue. All write operations on the RAID volume are first logged on dedicated journaling device that is not part of the volume."/>
+        </Member>
+        <Member Name="DistributedLog">
+          <Annotation Term="OData.Description" String="The policy that distributes additional log among the volume's capacity sources to address write hole issue."/>
+          <Annotation
+            Term="OData.LongDescription"
+            String="The policy that distributes additional log (e.q. cheksum of the parity) among the volume's capacity sources to address write hole issue. Additional data is used to detect data corruption on the volume."/>
+        </Member>
+        <Member Name="Oem">
+          <Annotation Term="OData.Description" String="The policy that is Oem specific."/>
+          <Annotation Term="OData.LongDescription" String="The policy that is Oem specific. The mechanism details are unknown unless provided separatly by the Oem."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="VolumeUsageType">
+        <Member Name="Data">
+          <Annotation Term="OData.Description" String="The volume is allocated for use as a consumable data volume."/>
+          <Annotation Term="OData.LongDescription" String="The volume shall be allocated for use as a consumable data volume."/>
+        </Member>
+        <Member Name="SystemData">
+          <Annotation Term="OData.Description" String="The volume is allocated for use as a consumable data volume reserved for system use."/>
+          <Annotation Term="OData.LongDescription" String="The volume shall be allocated for use as a consumable data volume reserved for system use."/>
+        </Member>
+        <Member Name="CacheOnly">
+          <Annotation Term="OData.Description" String="The volume is allocated for use as a non-consumable cache only volume."/>
+          <Annotation Term="OData.LongDescription" String="The volume shall be allocated for use as a non-consumable cache only volume."/>
+        </Member>
+        <Member Name="SystemReserve">
+          <Annotation Term="OData.Description" String="The volume is allocated for use as a non-consumable system reserved volume."/>
+          <Annotation Term="OData.LongDescription" String="The volume shall be allocated for use as a non-consumable system reserved volume."/>
+        </Member>
+        <Member Name="ReplicationReserve">
+          <Annotation Term="OData.Description" String="The volume is allocated for use as a non-consumable reserved volume for replication use."/>
+          <Annotation Term="OData.LongDescription" String="The volume shall be allocated for use as a non-consumable reserved volume for replication use."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="ReadCachePolicyType">
+        <Member Name="ReadAhead">
+          <Annotation Term="OData.Description" String="A caching technique in which the controller pre-fetches data anticipating future read requests."/>
+        </Member>
+        <Member Name="AdaptiveReadAhead">
+          <Annotation Term="OData.Description" String="A caching technique in which the controller dynamically determines whether to pre-fetch data anticipating future read requests, based on previous cache hit ratio."/>
+        </Member>
+        <Member Name="Off">
+          <Annotation Term="OData.Description" String="The read cache is disabled."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="WriteCachePolicyType">
+        <Member Name="WriteThrough">
+          <Annotation Term="OData.Description" String="A caching technique in which the completion of a write request is not signaled until data is safely stored on non-volatile media."/>
+          <Annotation Term="OData.LongDescription" String="A caching technique in which the completion of a write request is not signaled until data is safely stored on non-volatile media."/>
+        </Member>
+        <Member Name="ProtectedWriteBack">
+          <Annotation Term="OData.Description" String="A caching technique in which the completion of a write request is signaled as soon as the data is in cache, and actual writing to non-volatile media is guaranteed to occur at a later time."/>
+          <Annotation Term="OData.LongDescription" String="A caching technique in which the completion of a write request is signaled as soon as the data is in cache, and actual writing to non-volatile media is guaranteed to occur at a later time."/>
+        </Member>
+        <Member Name="UnprotectedWriteBack">
+          <Annotation Term="OData.Description" String="A caching technique in which the completion of a write request is signaled as soon as the data is in cache; actual writing to non-volatile media is not guaranteed to occur at a later time."/>
+          <Annotation Term="OData.LongDescription" String="A caching technique in which the completion of a write request is signaled as soon as the data is in cache; actual writing to non-volatile media is not guaranteed to occur at a later time."/>
+        </Member>
+      </EnumType>
+
+      <EnumType Name="WriteCacheStateType">
+        <Member Name="Unprotected">
+          <Annotation Term="OData.Description" String="Indicates that the cache state type in use generally does not protect write requests on non-volatile media."/>
+          <Annotation Term="OData.LongDescription" String="Indicates that the cache state type in use generally does not protect write requests on non-volatile media."/>
+        </Member>
+        <Member Name="Protected">
+          <Annotation Term="OData.Description" String="Indicates that the cache state type in use generally protects write requests on non-volatile media."/>
+          <Annotation Term="OData.LongDescription" String="Indicates that the cache state type in use generally protects write requests on non-volatile media."/>
+        </Member>
+        <Member Name="Degraded">
+          <Annotation Term="OData.Description" String="Indicates an issue with the cache state in which the cache space is diminished or disabled due to a failure or an outside influence such as a discharged battery."/>
+          <Annotation Term="OData.LongDescription" String="Indicates an issue with the cache state in which the cache space is diminished or disabled due to a failure or an outside influence such as a discharged battery."/>
+        </Member>
+      </EnumType>
+
+      <Action Name="AssignReplicaTarget" IsBound="true">
+        <Parameter Name="Volume" Type="Volume.v1_0_0.Actions"/>
+        <Parameter Name="ReplicaUpdateMode" Type="StorageReplicaInfo.ReplicaUpdateMode" Nullable="false">
+          <Annotation Term="OData.Description" String="The replica update mode (synchronous vs asynchronous)."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall specify the replica update mode."/>
+        </Parameter>
+        <Parameter Name="TargetVolume" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The Uri to the existing target volume."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Uri to the existing target volume."/>
+        </Parameter>
+        <Parameter Name="ReplicaType" Type="StorageReplicaInfo.ReplicaType" Nullable="false">
+          <Annotation Term="OData.Description" String="The type of replica relationship to be created."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the type of replica relationship to be created (e.g., Clone, Mirror, Snap)."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action is used to establish a replication relationship by assigning an existing volume to serve as a target replica for an existing source volume."/>
+        <Annotation Term="OData.LongDescription" String="This action shall be used to establish a replication relationship by assigning an existing volume to serve as a target replica for an existing source volume."/>
+      </Action>
+
+      <Action Name="CreateReplicaTarget" IsBound="true">
+        <Parameter Name="Volume" Type="Volume.v1_0_0.Actions"/>
+        <Parameter Name="ReplicaUpdateMode" Type="StorageReplicaInfo.ReplicaUpdateMode" Nullable="false">
+          <Annotation Term="OData.Description" String="The replica update mode (synchronous vs asynchronous)."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall specify the replica update mode."/>
+        </Parameter>
+        <Parameter Name="VolumeName" Type="Edm.String">
+          <Annotation Term="OData.Description" String="The Name for the new target volume."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Name for the target volume."/>
+        </Parameter>
+        <Parameter Name="TargetStoragePool" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The Uri to the existing target Storage Pool."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Uri to the existing StoragePool in which to create the target volume."/>
+        </Parameter>
+        <Parameter Name="ReplicaType" Type="StorageReplicaInfo.ReplicaType" Nullable="false">
+          <Annotation Term="OData.Description" String="The type of replica relationship to be created."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the type of replica relationship to be created (e.g., Clone, Mirror, Snap)."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action is used to create a new volume resource to provide expanded data protection through a replica relationship with the specified source volume."/>
+        <Annotation Term="OData.LongDescription" String="This action shall be used to create a new volume resource to provide expanded data protection through a replica relationship with the specified source volume."/>
+      </Action>
+
+      <Action Name="RemoveReplicaRelationship" IsBound="true">
+        <Parameter Name="Volume" Type="Volume.v1_0_0.Actions"/>
+        <Parameter Name="TargetVolume" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The Uri to the existing target volume."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Uri to the existing target volume."/>
+        </Parameter>
+        <Parameter Name="DeleteTargetVolume" Type="Edm.Boolean">
+          <Annotation Term="OData.Description" String="Indicate whether or not to delete the target volume as part of the operation."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall indicate whether or not to delete the target volume as part of the operation. If not defined, the system should use its default behavior."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action is used to disable data synchronization between a source and target volume, remove the replication relationship, and optionally delete the target volume."/>
+        <Annotation Term="OData.LongDescription" String="This action shall be used to disable data synchronization between a source and target volume, remove the replication relationship, and optionally delete the target volume."/>
+      </Action>
+
+      <Action Name="ResumeReplication" IsBound="true">
+        <Parameter Name="Volume" Type="Volume.v1_0_0.Actions"/>
+        <Parameter Name="TargetVolume" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The Uri to the existing target volume."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Uri to the existing target volume."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action is used to resume the active data synchronization between a source and target volume, without otherwise altering the replication relationship."/>
+        <Annotation Term="OData.LongDescription" String="This action shall be used to resume the active data synchronization between a source and target volume, without otherwise altering the replication relationship."/>
+      </Action>
+
+      <Action Name="ReverseReplicationRelationship" IsBound="true">
+        <Parameter Name="Volume" Type="Volume.v1_0_0.Actions"/>
+        <Parameter Name="TargetVolume" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The Uri to the existing target volume."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Uri to the existing target volume."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action is used to reverse the replication relationship between a source and target volume."/>
+        <Annotation Term="OData.LongDescription" String="This action shall be used to reverse the replication relationship between a source and target volume."/>
+      </Action>
+
+      <Action Name="SplitReplication" IsBound="true">
+        <Parameter Name="Volume" Type="Volume.v1_0_0.Actions"/>
+        <Parameter Name="TargetVolume" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The Uri to the existing target volume."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Uri to the existing target volume."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action is used to split the replication relationship and suspend data synchronization between a source and target volume."/>
+        <Annotation Term="OData.LongDescription" String="This action shall be used to split the replication relationship and suspend data synchronization between a source and target volume."/>
+      </Action>
+
+      <Action Name="SuspendReplication" IsBound="true">
+        <Parameter Name="Volume" Type="Volume.v1_0_0.Actions"/>
+        <Parameter Name="TargetVolume" Type="Edm.String" Nullable="false">
+          <Annotation Term="OData.Description" String="The Uri to the existing target volume."/>
+          <Annotation Term="OData.LongDescription" String="This parameter shall contain the Uri to the existing target volume."/>
+        </Parameter>
+        <Annotation Term="OData.Description" String="This action is used to suspend active data synchronization between a source and target volume, without otherwise altering the replication relationship."/>
+        <Annotation Term="OData.LongDescription" String="This action shall be used to suspend active data synchronization between a source and target volume, without otherwise altering the replication relationship."/>
+      </Action>
+
+    </Schema>
+  </edmx:DataServices>
 </edmx:Edmx>