diff --git a/static/redfish/v1/JsonSchemas/Manager/Manager.json b/static/redfish/v1/JsonSchemas/Manager/Manager.json
index beae6fe..bfc514f 100644
--- a/static/redfish/v1/JsonSchemas/Manager/Manager.json
+++ b/static/redfish/v1/JsonSchemas/Manager/Manager.json
@@ -1,15 +1,15 @@
 {
-    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_5_1.json",
+    "$id": "http://redfish.dmtf.org/schemas/v1/Manager.v1_6_0.json",
     "$ref": "#/definitions/Manager",
     "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json",
-    "copyright": "Copyright 2014-2018 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
-            "description": "The available actions for this resource.",
-            "longDescription": "This type shall contain the available actions for this resource.",
+            "description": "The available actions for this Resource.",
+            "longDescription": "This type shall contain the available actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -34,8 +34,8 @@
                 },
                 "Oem": {
                     "$ref": "#/definitions/OemActions",
-                    "description": "This property contains the available OEM specific actions for this resource.",
-                    "longDescription": "This property shall contain any additional OEM actions for this resource."
+                    "description": "The available OEM-specific actions for this Resource.",
+                    "longDescription": "This property shall contain the available OEM-specific actions for this Resource."
                 }
             },
             "type": "object"
@@ -48,19 +48,19 @@
                 "Oem"
             ],
             "enumDescriptions": {
-                "IPMI": "The controller supports a Command Shell connection using the IPMI Serial-over-LAN (SOL) protocol.",
-                "Oem": "The controller supports a Command Shell connection using an OEM-specific protocol.",
-                "SSH": "The controller supports a Command Shell connection using the SSH protocol.",
-                "Telnet": "The controller supports a Command Shell connection using the Telnet protocol."
+                "IPMI": "The controller supports a command shell connection through the IPMI Serial Over LAN (SOL) protocol.",
+                "Oem": "The controller supports a command shell connection through an OEM-specific protocol.",
+                "SSH": "The controller supports a command shell connection through the SSH protocol.",
+                "Telnet": "The controller supports a command shell connection through the Telnet protocol."
             },
             "type": "string"
         },
         "CommandShell": {
             "additionalProperties": false,
-            "description": "Information about a Command Shell service provided by a manager.",
-            "longDescription": "This type shall describe a Command Shell service of a manager.",
+            "description": "The information about a command shell service that this manager provides.",
+            "longDescription": "This type shall describe a command shell service for a manager.",
             "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",
@@ -75,24 +75,24 @@
             },
             "properties": {
                 "ConnectTypesSupported": {
-                    "description": "This object is used to enumerate the Command Shell connection types allowed by the implementation.",
+                    "description": "This property enumerates the command shell connection types that the implementation allows.",
                     "items": {
                         "$ref": "#/definitions/CommandConnectTypesSupported"
                     },
-                    "longDescription": "The value of ConnectTypesSupported shall be an array of the enumerations provided here.  SSH shall be included if the Secure Shell (SSH) protocol is supported.  Telnet shall be included if the Telnet protocol is supported.  IPMI shall be included if the IPMI (Serial-over-LAN) protocol is supported.",
+                    "longDescription": "This property shall contain an array of the enumerations.  SSH shall be included if the Secure Shell (SSH) protocol is supported.  Telnet shall be included if the Telnet protocol is supported.  IPMI shall be included if the IPMI Serial Over LAN (SOL) protocol is supported.",
                     "readonly": true,
                     "type": "array"
                 },
                 "MaxConcurrentSessions": {
-                    "description": "Indicates the maximum number of service sessions, regardless of protocol, this manager is able to support.",
-                    "longDescription": "The value of this property shall contain the maximum number of concurrent service sessions supported by the implementation.",
+                    "description": "The maximum number of service sessions, regardless of protocol, that this manager can support.",
+                    "longDescription": "This property shall contain the maximum number of concurrent service sessions that this implementation supports.",
                     "minimum": 0,
                     "readonly": true,
                     "type": "integer"
                 },
                 "ServiceEnabled": {
-                    "description": "Indicates if the service is enabled for this manager.",
-                    "longDescription": "The value of this property shall contain the enabled status of the protocol used for the service.  The value shall be true if enabled and false if disabled.",
+                    "description": "An indication of whether the service is enabled for this manager.",
+                    "longDescription": "This property shall indicate whether the protocol for the service is enabled.",
                     "readonly": false,
                     "type": "boolean"
                 }
@@ -106,13 +106,13 @@
             "parameters": {
                 "NewManager": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Manager.json#/definitions/Manager",
-                    "description": "This parameter specifies the Manager in which to fail over.  In this case, a valid reference is supported.",
-                    "longDescription": "This parameter shall contain a resource reference of the Manager in which to fail over.",
+                    "description": "The manager to which to fail over.",
+                    "longDescription": "This parameter shall contain the manager to which to fail over.",
                     "requiredParameter": 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",
@@ -128,7 +128,7 @@
             "properties": {
                 "target": {
                     "description": "Link to invoke action",
-                    "format": "uri",
+                    "format": "uri-reference",
                     "type": "string"
                 },
                 "title": {
@@ -144,17 +144,17 @@
                 "Oem"
             ],
             "enumDescriptions": {
-                "KVMIP": "The controller supports a Graphical Console connection using a KVM-IP (redirection of Keyboard, Video, Mouse over IP) protocol.",
-                "Oem": "The controller supports a Graphical Console connection using an OEM-specific protocol."
+                "KVMIP": "The controller supports a graphical console connection through a KVM-IP (redirection of Keyboard, Video, Mouse over IP) protocol.",
+                "Oem": "The controller supports a graphical console connection through an OEM-specific protocol."
             },
             "type": "string"
         },
         "GraphicalConsole": {
             "additionalProperties": false,
-            "description": "Information about a Graphical Console service provided by a manager.",
-            "longDescription": "This type shall describe a Graphical Console service of a manager.",
+            "description": "The information about a graphical console service that this manager provides.",
+            "longDescription": "This type shall describe a graphical console service for a manager.",
             "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",
@@ -169,24 +169,24 @@
             },
             "properties": {
                 "ConnectTypesSupported": {
-                    "description": "This object is used to enumerate the Graphical Console connection types allowed by the implementation.",
+                    "description": "This property enumerates the graphical console connection types that the implementation allows.",
                     "items": {
                         "$ref": "#/definitions/GraphicalConnectTypesSupported"
                     },
-                    "longDescription": "The value of ConnectTypesSupported shall be an array of the enumerations provided here.  RDP shall be included if the Remote Desktop (RDP) protocol is supported.  KVMIP shall be included if a vendor-define KVM-IP protocol is supported.",
+                    "longDescription": "This property shall contain an array of the enumerations.  RDP shall be included if the Remote Desktop (RDP) protocol is supported.  KVMIP shall be included if a vendor-define KVM-IP protocol is supported.",
                     "readonly": true,
                     "type": "array"
                 },
                 "MaxConcurrentSessions": {
-                    "description": "Indicates the maximum number of service sessions, regardless of protocol, this manager is able to support.",
-                    "longDescription": "The value of this property shall contain the maximum number of concurrent service sessions supported by the implementation.",
+                    "description": "The maximum number of service sessions, regardless of protocol, that this manager can support.",
+                    "longDescription": "This property shall contain the maximum number of concurrent service sessions that this implementation supports.",
                     "minimum": 0,
                     "readonly": true,
                     "type": "integer"
                 },
                 "ServiceEnabled": {
-                    "description": "Indicates if the service is enabled for this manager.",
-                    "longDescription": "The value of this property shall contain the enabled status of the protocol used for the service.  The value shall be true if enabled and false if disabled.",
+                    "description": "An indication of whether the service is enabled for this manager.",
+                    "longDescription": "This property shall indicate whether the protocol for the service is enabled.",
                     "readonly": false,
                     "type": "boolean"
                 }
@@ -195,10 +195,10 @@
         },
         "Links": {
             "additionalProperties": false,
-            "description": "Contains references to other resources that are related to this resource.",
-            "longDescription": "This type, as described by the Redfish Specification, shall contain references to resources that are related to, but not contained by (subordinate to), this resource.",
+            "description": "The links to other Resources that are related to this Resource.",
+            "longDescription": "This Redfish Specification-described type shall contain links to Resources that are related to but not contained by or subordinate to this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -212,64 +212,84 @@
                 }
             },
             "properties": {
+                "ActiveSoftwareImage": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/SoftwareInventory",
+                    "description": "The link to the SoftwareInventory Resource that represents the active firmware image for this manager.",
+                    "longDescription": "This property shall contain a link to the SoftwareInventory Resource that represent the active firmware image for this manager.",
+                    "readonly": false,
+                    "versionAdded": "v1_6_0"
+                },
                 "ManagerForChassis": {
-                    "description": "This property is an array of references to the chassis that this manager has control over.",
+                    "description": "An array of links to the chassis this manager controls.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/Chassis.json#/definitions/Chassis"
                     },
-                    "longDescription": "This property shall contain an array of references to Chassis resources of which this Manager instance has control.",
+                    "longDescription": "This property shall contain an array of links to chassis over which this manager instance has control.",
                     "readonly": true,
                     "type": "array"
                 },
                 "ManagerForChassis@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "ManagerForServers": {
-                    "description": "This property is an array of references to the systems that this manager has control over.",
+                    "description": "An array of links to the systems that this manager controls.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/ComputerSystem.json#/definitions/ComputerSystem"
                     },
-                    "longDescription": "This property shall contain an array of references to ComputerSystem resources of which this Manager instance has control.",
+                    "longDescription": "This property shall contain an array of links to computer systems over which this manager instance has control.",
                     "readonly": true,
                     "type": "array"
                 },
                 "ManagerForServers@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "ManagerForSwitches": {
-                    "description": "This property is an array of references to the switches that this manager has control over.",
+                    "description": "An array of links to the switches that this manager controls.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/Switch.json#/definitions/Switch"
                     },
-                    "longDescription": "This property shall contain an array of references to Switch resources of which this Manager instance has control.",
+                    "longDescription": "This property shall contain an array of links to switches that this manager instance controls.",
                     "readonly": true,
                     "type": "array",
                     "versionAdded": "v1_4_0"
                 },
                 "ManagerForSwitches@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "ManagerInChassis": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Chassis.json#/definitions/Chassis",
-                    "description": "This property is a reference to the chassis that this manager is located in.",
-                    "longDescription": "This property shall contain a reference to the chassis that this manager is located in.",
+                    "description": "The link to the chassis where this manager is located.",
+                    "longDescription": "This property shall contain a link to the chassis where this manager is located.",
                     "readonly": true,
                     "versionAdded": "v1_1_0"
                 },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "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."
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties contained in this object shall conform to the Redfish Specification-described requirements."
+                },
+                "SoftwareImages": {
+                    "description": "The images that are associated with this manager.",
+                    "items": {
+                        "$ref": "http://redfish.dmtf.org/schemas/v1/SoftwareInventory.json#/definitions/SoftwareInventory"
+                    },
+                    "longDescription": "This property shall contain an array of links to the SoftwareInventory Resources that represent the firmware images that apply to this manager.",
+                    "readonly": true,
+                    "type": "array",
+                    "versionAdded": "v1_6_0"
+                },
+                "SoftwareImages@odata.count": {
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 }
             },
             "type": "object"
         },
         "Manager": {
             "additionalProperties": false,
-            "description": "This is the schema definition for a Manager.  Examples of managers are BMCs, Enclosure Managers, Management Controllers and other subsystems assigned managability functions.",
-            "longDescription": "This resource shall be used to represent a management subsystem for a Redfish implementation.",
+            "description": "In Redfish, a manager is a systems management entity that may implement or provide access to a Redfish Service.  Examples of managers are BMCs, enclosure managers, management controllers, and other subsystems that are assigned managability functions.  An implementation may have multiple managers, which may or may not be directly accessible through a Redfish-defined interface.",
+            "longDescription": "This Resource shall represent a management subsystem 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",
@@ -284,38 +304,38 @@
             },
             "properties": {
                 "@odata.context": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/context"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context"
                 },
                 "@odata.etag": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/etag"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag"
                 },
                 "@odata.id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id"
                 },
                 "@odata.type": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/type"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type"
                 },
                 "Actions": {
                     "$ref": "#/definitions/Actions",
-                    "description": "The available actions for this resource.",
-                    "longDescription": "The Actions property shall contain the available actions for this resource."
+                    "description": "The available actions for this Resource.",
+                    "longDescription": "The actions property shall contain the available actions for this Resource."
                 },
                 "AutoDSTEnabled": {
-                    "description": "Indicates whether the manager is configured for automatic DST adjustment.",
-                    "longDescription": "The value of this property shall contain the enabled status of the automatic Daylight Saving Time (DST) adjustment of the manager's DateTime.  It shall be true if Automatic DST adjustment is enabled and false if disabled.",
+                    "description": "An indication of whether the manager is configured for automatic Daylight Saving Time (DST) adjustment.",
+                    "longDescription": "This property shall indicate whether the manager is configured for automatic Daylight Saving Time (DST) adjustment.",
                     "readonly": false,
                     "type": "boolean",
                     "versionAdded": "v1_4_0"
                 },
                 "CommandShell": {
                     "$ref": "#/definitions/CommandShell",
-                    "description": "Information about the Command Shell service provided by this manager.",
-                    "longDescription": "The value of this property shall contain information about the Command Shell service of this manager."
+                    "description": "The command shell service that this manager provides.",
+                    "longDescription": "This property shall contain information about the command shell service of this manager."
                 },
                 "DateTime": {
-                    "description": "The current DateTime (with offset) for the manager, used to set or read time.",
+                    "description": "The current date and time with UTC offset that the manager uses to set or read time.",
                     "format": "date-time",
-                    "longDescription": "The value of this property shall represent the current DateTime value for the manager, with offset from UTC, in Redfish Timestamp format.",
+                    "longDescription": "This property shall represent the current DateTime value for the manager, with UTC offset, in Redfish Timestamp format.",
                     "readonly": false,
                     "type": [
                         "string",
@@ -323,9 +343,9 @@
                     ]
                 },
                 "DateTimeLocalOffset": {
-                    "description": "The time offset from UTC that the DateTime property is set to in format: +06:00 .",
-                    "longDescription": "The value is property shall represent the offset from UTC time that the current value of DataTime property contains.",
-                    "pattern": "([-+][0-1][0-9]:[0-5][0-9])",
+                    "description": "The time offset from UTC that the DateTime property is in `+HH:MM` format.",
+                    "longDescription": "This property shall represent the offset from UTC time that the current DataTime property contains.",
+                    "pattern": "^([-+][0-1][0-9]:[0-5][0-9])$",
                     "readonly": false,
                     "type": [
                         "string",
@@ -345,12 +365,12 @@
                 },
                 "EthernetInterfaces": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/EthernetInterfaceCollection.json#/definitions/EthernetInterfaceCollection",
-                    "description": "This is a reference to a collection of NICs that this manager uses for network communication.  It is here that clients will find NIC configuration options and settings.",
-                    "longDescription": "The value of this property shall be a link to a collection of type EthernetInterfaceCollection.",
+                    "description": "The link to a collection of NICs that this manager uses for network communication.",
+                    "longDescription": "This property shall contain a link to a Resource Collection of type EthernetInterfaceCollection.",
                     "readonly": true
                 },
                 "FirmwareVersion": {
-                    "description": "The firmware version of this Manager.",
+                    "description": "The firmware version of this manager.",
                     "longDescription": "This property shall contain the firwmare version as defined by the manufacturer for the associated manager.",
                     "readonly": true,
                     "type": [
@@ -360,13 +380,13 @@
                 },
                 "GraphicalConsole": {
                     "$ref": "#/definitions/GraphicalConsole",
-                    "description": "The value of this property shall contain the information about the Graphical Console (KVM-IP) service of this manager.",
-                    "longDescription": "The value of this property shall contain the information about the Graphical Console (KVM-IP) service of this manager."
+                    "description": "The information about the graphical console (KVM-IP) service of this manager.",
+                    "longDescription": "This property shall contain the information about the graphical console (KVM-IP) service of this manager."
                 },
                 "HostInterfaces": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/HostInterfaceCollection.json#/definitions/HostInterfaceCollection",
-                    "description": "This is a reference to a collection of Host Interfaces that this manager uses for local host communication.  It is here that clients will find Host Interface configuration options and settings.",
-                    "longDescription": "The value of this property shall be a link to a collection of type HostInterfaceCollection.",
+                    "description": "The link to a collection of Host Interfaces that this manager uses for local host communication.  Clients can find Host Interface configuration options and settings in this navigation property.",
+                    "longDescription": "This property shall contain a link to a Resource Collection of type HostInterfaceCollection.",
                     "readonly": true,
                     "versionAdded": "v1_3_0"
                 },
@@ -376,24 +396,24 @@
                 },
                 "Links": {
                     "$ref": "#/definitions/Links",
-                    "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."
+                    "description": "The links to other Resources that are related to this Resource.",
+                    "longDescription": "This property shall contain links to Resources that are related to but are not contained by or subordinate to this Resource."
                 },
                 "LogServices": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/LogServiceCollection.json#/definitions/LogServiceCollection",
-                    "description": "This is a reference to a collection of Logs used by the manager.",
-                    "longDescription": "The value of this property shall contain a reference to a collection of type LogServiceCollection which are for the use of this manager.",
+                    "description": "The link to a collection of logs that the manager uses.",
+                    "longDescription": "This property shall contain a link to a Resource Collection of type LogServiceCollection that this manager uses.",
                     "readonly": true
                 },
                 "ManagerType": {
                     "$ref": "#/definitions/ManagerType",
-                    "description": "This property represents the type of manager that this resource represents.",
-                    "longDescription": "The value of this property shall describe the function of this manager.  The value EnclosureManager shall be used if this manager controls one or more services through aggregation.  The value BMC shall be used if this manager represents a traditional server management controller. The value ManagementController shall be used if none of the other enumerations apply.",
+                    "description": "The type of manager that this Resource represents.",
+                    "longDescription": "This property shall describe the function of this manager.  The `ManagementController` value shall be used if none of the other enumerations apply.",
                     "readonly": true
                 },
                 "Model": {
-                    "description": "The model information of this Manager as defined by the manufacturer.",
-                    "longDescription": "The value of this property shall contain the information about how the manufacturer references this manager.",
+                    "description": "The model information of this manager, as defined by the manufacturer.",
+                    "longDescription": "This property shall contain the information about how the manufacturer refers to this manager.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -406,14 +426,14 @@
                 },
                 "NetworkProtocol": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/ManagerNetworkProtocol.json#/definitions/ManagerNetworkProtocol",
-                    "description": "This is a reference to the network services and their settings that the manager controls.  It is here that clients will find network configuration options as well as network services.",
-                    "longDescription": "The value of this property shall contain a reference to a resource of type ManagerNetworkProtocol which represents the network services for this manager.",
+                    "description": "The link to the network services and their settings that the manager controls.",
+                    "longDescription": "This property shall contain a link to a Resource of the ManagerNetworkProtocol, which represents the network services for this manager.",
                     "readonly": true
                 },
                 "Oem": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem",
-                    "description": "This is the manufacturer/provider specific extension moniker used to divide the Oem object into sections.",
-                    "longDescription": "The value of this string shall be of the format for the reserved word *Oem*."
+                    "description": "The OEM extension property.",
+                    "longDescription": "This property shall contain the OEM extensions.  All values for properties that this object contains shall conform to the Redfish Specification-described requirements."
                 },
                 "PowerState": {
                     "anyOf": [
@@ -424,34 +444,34 @@
                             "type": "null"
                         }
                     ],
-                    "description": "This is the current power state of the Manager.",
-                    "longDescription": "The value of this property shall contain the power state of the Manager.",
+                    "description": "The current power state of the manager.",
+                    "longDescription": "This property shall contain the power state of the manager.",
                     "readonly": true,
                     "versionAdded": "v1_2_0"
                 },
                 "Redundancy": {
                     "autoExpand": true,
-                    "description": "Redundancy information for the managers of this system.",
+                    "description": "The redundancy information for the managers of this system.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/Redundancy.json#/definitions/Redundancy"
                     },
-                    "longDescription": "The values of the properties in this array shall be used to show how this manager is grouped with other managers for form redundancy sets.",
+                    "longDescription": "The properties in this array shall show how this manager is grouped with other managers for form redundancy sets.",
                     "type": "array"
                 },
                 "Redundancy@odata.count": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/count"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/count"
                 },
                 "RemoteAccountService": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/AccountService.json#/definitions/AccountService",
-                    "description": "This property contains a reference to the AccountService resource for the remote Manager represented by this resource.",
-                    "longDescription": "This property shall contain a reference to the AccountService resource for the remote Manager represented by this resource.  This property shall only be present when providing aggregation of Redfish services.",
+                    "description": "The link to the AccountService Resource for the remote manager that this Resource represents.",
+                    "longDescription": "This property shall contain a link to the AccountService Resource for the remote manager that this Resource represents.  This property shall only be present when providing aggregation of Redfish Services.",
                     "readonly": true,
                     "versionAdded": "v1_5_0"
                 },
                 "RemoteRedfishServiceUri": {
-                    "description": "This property contains the URI of the Redfish Service Root for the remote Manager represented by this resource.",
-                    "format": "uri",
-                    "longDescription": "This property shall contain the URI of the Redfish Service Root for the remote Manager represented by this resource.  This property shall only be present when providing aggregation of Redfish services.",
+                    "description": "The URI of the Redfish Service Root for the remote manager that this Resource represents.",
+                    "format": "uri-reference",
+                    "longDescription": "This property shall contain the URI of the Redfish Service Root for the remote manager that this Resource represents.  This property shall only be present when providing aggregation of Redfish Services.",
                     "readonly": true,
                     "type": [
                         "string",
@@ -461,13 +481,13 @@
                 },
                 "SerialConsole": {
                     "$ref": "#/definitions/SerialConsole",
-                    "description": "Information about the Serial Console service provided by this manager.",
-                    "longDescription": "The value of this property shall contain information about the Serial Console service of this manager."
+                    "description": "The serial console service that this manager provides.",
+                    "longDescription": "This property shall contain information about the serial console service of this manager."
                 },
                 "SerialInterfaces": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/SerialInterfaceCollection.json#/definitions/SerialInterfaceCollection",
-                    "description": "This is a reference to a collection of serial interfaces that this manager uses for serial and console communication.  It is here that clients will find serial configuration options and settings.",
-                    "longDescription": "The value of this property shall be a link to a collection of type SerialInterfaceCollection which are for the use of this manager.",
+                    "description": "The link to a collection of serial interfaces that this manager uses for serial and console communication.",
+                    "longDescription": "This property shall contain a link to a Resource Collection of type SerialInterfaceCollection, which this manager uses.",
                     "readonly": true
                 },
                 "ServiceEntryPointUUID": {
@@ -479,14 +499,14 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The UUID of the Redfish Service provided by this manager.",
-                    "longDescription": "This property shall contain the UUID of the Redfish Service provided by this manager.  Each Manager providing an Entry Point to the same Redfish Service shall report the same UUID value (even though the name of the property may imply otherwise).  This property shall not be present if this manager does not provide a Redfish Service Entry Point.",
+                    "description": "The UUID of the Redfish Service that is hosted by this manager.",
+                    "longDescription": "This property shall contain the UUID of the Redfish Service that is hosted by this manager.  Each manager providing an entry point to the same Redfish Service shall report the same UUID value, even though the name of the property may imply otherwise.  This property shall not be present if this manager does not provide a Redfish Service entry point.",
                     "readonly": true
                 },
                 "Status": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Status",
-                    "description": "This property describes the status and health of the resource and its children.",
-                    "longDescription": "This property shall contain any status or health properties of the resource."
+                    "description": "The status and health of the Resource and its subordinate or dependent Resources.",
+                    "longDescription": "This property shall contain any status or health properties of the Resource."
                 },
                 "UUID": {
                     "anyOf": [
@@ -497,14 +517,14 @@
                             "type": "null"
                         }
                     ],
-                    "description": "The Universal Unique Identifier (UUID) for this Manager.",
-                    "longDescription": "The value of this property shall contain the universal unique identifier number for the manager.",
+                    "description": "The UUID for this manager.",
+                    "longDescription": "This property shall contain the UUID for the manager.",
                     "readonly": true
                 },
                 "VirtualMedia": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/VirtualMediaCollection.json#/definitions/VirtualMediaCollection",
-                    "description": "This is a reference to the Virtual Media services for this particular manager.",
-                    "longDescription": "The value of this property shall contain a reference to a collection of type VirtualMediaCollection which are for the use of this manager.",
+                    "description": "The link to the Virtual Media services for this particular manager.",
+                    "longDescription": "This property shall contain a link to a Resource Collection of type VirtualMediaCollection, which this manager uses.",
                     "readonly": true
                 }
             },
@@ -518,9 +538,9 @@
         },
         "ManagerService": {
             "additionalProperties": false,
-            "description": "Used for describing services like Serial Console, Command Shell or Graphical Console.",
+            "description": "The manager services, such as serial console, command shell, or graphical console service.",
             "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",
@@ -535,15 +555,15 @@
             },
             "properties": {
                 "MaxConcurrentSessions": {
-                    "description": "Indicates the maximum number of service sessions, regardless of protocol, this manager is able to support.",
-                    "longDescription": "The value of this property shall contain the maximum number of concurrent service sessions supported by the implementation.",
+                    "description": "The maximum number of service sessions, regardless of protocol, that this manager can support.",
+                    "longDescription": "This property shall contain the maximum number of concurrent service sessions that this implementation supports.",
                     "minimum": 0,
                     "readonly": true,
                     "type": "integer"
                 },
                 "ServiceEnabled": {
-                    "description": "Indicates if the service is enabled for this manager.",
-                    "longDescription": "The value of this property shall contain the enabled status of the protocol used for the service.  The value shall be true if enabled and false if disabled.",
+                    "description": "An indication of whether the service is enabled for this manager.",
+                    "longDescription": "This property shall indicate whether the protocol for the service is enabled.",
                     "readonly": false,
                     "type": "boolean"
                 }
@@ -560,12 +580,12 @@
                 "Service"
             ],
             "enumDescriptions": {
-                "AuxiliaryController": "A controller which provides management functions for a particular subsystem or group of devices.",
-                "BMC": "A controller which provides management functions for a single computer system.",
-                "EnclosureManager": "A controller which provides management functions for a chassis or group of devices or systems.",
-                "ManagementController": "A controller used primarily to monitor or manage the operation of a device or system.",
-                "RackManager": "A controller which provides management functions for a whole or part of a rack.",
-                "Service": "A software-based service which provides management functions."
+                "AuxiliaryController": "A controller that provides management functions for a particular subsystem or group of devices.",
+                "BMC": "A controller that provides management functions for a single computer system.",
+                "EnclosureManager": "A controller that provides management functions for a chassis or group of devices or systems.",
+                "ManagementController": "A controller that primarily monitors or manages the operation of a device or system.",
+                "RackManager": "A controller that provides management functions for a whole or part of a rack.",
+                "Service": "A software-based service that provides management functions."
             },
             "enumVersionAdded": {
                 "Service": "v1_4_0"
@@ -574,28 +594,28 @@
         },
         "ModifyRedundancySet": {
             "additionalProperties": false,
-            "description": "The ModifyRedundancySet operation is used to add or remove members to a redundant group of manager.",
-            "longDescription": "The ModifyRedundancySet operation shall be used to add or remove members to a redundant group of manager.",
+            "description": "The ModifyRedundancySet operation adds members to or removes members from a redundant group of managers.",
+            "longDescription": "The ModifyRedundancySet operation shall add members to or remove members from a redundant group of managers.",
             "parameters": {
                 "Add": {
-                    "description": "This array defines the Managers to add to the redundancy set.  In this case, a valid reference is supported.",
+                    "description": "An array of managers to add to the redundancy set.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/Manager.json#/definitions/Manager"
                     },
-                    "longDescription": "This parameter shall contain an array of resource references of the Managers to add to the redundancy set.",
+                    "longDescription": "This parameter shall contain an array of managers to add to the redundancy set.",
                     "type": "array"
                 },
                 "Remove": {
-                    "description": "This array defines the Managers to remove from the redundancy set.  In this case, a valid reference is supported.",
+                    "description": "An array of managers to remove from the redundancy set.",
                     "items": {
                         "$ref": "http://redfish.dmtf.org/schemas/v1/Manager.json#/definitions/Manager"
                     },
-                    "longDescription": "This parameter shall contain an array of resource references of the Managers to remove from the redundancy set.",
+                    "longDescription": "This parameter shall contain an array of managers to remove from the redundancy set.",
                     "type": "array"
                 }
             },
             "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",
@@ -611,7 +631,7 @@
             "properties": {
                 "target": {
                     "description": "Link to invoke action",
-                    "format": "uri",
+                    "format": "uri-reference",
                     "type": "string"
                 },
                 "title": {
@@ -623,10 +643,10 @@
         },
         "OemActions": {
             "additionalProperties": true,
-            "description": "The available OEM specific actions for this resource.",
-            "longDescription": "This type shall contain any additional OEM actions for this resource.",
+            "description": "The available OEM-specific actions for this Resource.",
+            "longDescription": "This type shall contain the available OEM-specific actions for this Resource.",
             "patternProperties": {
-                "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_.]+$": {
+                "^([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",
@@ -645,16 +665,16 @@
         "Reset": {
             "additionalProperties": false,
             "description": "The reset action resets/reboots the manager.",
-            "longDescription": "This action shall perform a reset of the manager.",
+            "longDescription": "This action shall reset the manager.",
             "parameters": {
                 "ResetType": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/ResetType",
-                    "description": "This is the type of reset to be performed.",
-                    "longDescription": "This parameter shall define the type of reset to be performed.  The service may accept a request without the parameter and perform an implementation specific default reset."
+                    "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_.]+$": {
+                "^([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",
@@ -670,7 +690,7 @@
             "properties": {
                 "target": {
                     "description": "Link to invoke action",
-                    "format": "uri",
+                    "format": "uri-reference",
                     "type": "string"
                 },
                 "title": {
@@ -688,19 +708,19 @@
                 "Oem"
             ],
             "enumDescriptions": {
-                "IPMI": "The controller supports a Serial Console connection using the IPMI Serial-over-LAN (SOL) protocol.",
-                "Oem": "The controller supports a Serial Console connection using an OEM-specific protocol.",
-                "SSH": "The controller supports a Serial Console connection using the SSH protocol.",
-                "Telnet": "The controller supports a Serial Console connection using the Telnet protocol."
+                "IPMI": "The controller supports a serial console connection through the IPMI Serial Over LAN (SOL) protocol.",
+                "Oem": "The controller supports a serial console connection through an OEM-specific protocol.",
+                "SSH": "The controller supports a serial console connection through the SSH protocol.",
+                "Telnet": "The controller supports a serial console connection through the Telnet protocol."
             },
             "type": "string"
         },
         "SerialConsole": {
             "additionalProperties": false,
-            "description": "Information about a Serial Console service provided by a manager.",
-            "longDescription": "This type shall describe a Serial Console service of a manager.",
+            "description": "The information about a serial console service that this manager provides.",
+            "longDescription": "This type shall describe a serial console service for a manager.",
             "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",
@@ -715,24 +735,24 @@
             },
             "properties": {
                 "ConnectTypesSupported": {
-                    "description": "This object is used to enumerate the Serial Console connection types allowed by the implementation.",
+                    "description": "This property enumerates the serial console connection types that the implementation allows.",
                     "items": {
                         "$ref": "#/definitions/SerialConnectTypesSupported"
                     },
-                    "longDescription": "The value of ConnectTypesSupported shall be an array of the enumerations provided here.  SSH shall be included if the Secure Shell (SSH) protocol is supported.  Telnet shall be included if the Telnet protocol is supported.  IPMI shall be included if the IPMI (Serial-over-LAN) protocol is supported.",
+                    "longDescription": "This property shall contain an array of the enumerations.  SSH shall be included if the Secure Shell (SSH) protocol is supported.  Telnet shall be included if the Telnet protocol is supported.  IPMI shall be included if the IPMI Serial Over LAN (SOL) protocol is supported.",
                     "readonly": true,
                     "type": "array"
                 },
                 "MaxConcurrentSessions": {
-                    "description": "Indicates the maximum number of service sessions, regardless of protocol, this manager is able to support.",
-                    "longDescription": "The value of this property shall contain the maximum number of concurrent service sessions supported by the implementation.",
+                    "description": "The maximum number of service sessions, regardless of protocol, that this manager can support.",
+                    "longDescription": "This property shall contain the maximum number of concurrent service sessions that this implementation supports.",
                     "minimum": 0,
                     "readonly": true,
                     "type": "integer"
                 },
                 "ServiceEnabled": {
-                    "description": "Indicates if the service is enabled for this manager.",
-                    "longDescription": "The value of this property shall contain the enabled status of the protocol used for the service.  The value shall be true if enabled and false if disabled.",
+                    "description": "An indication of whether the service is enabled for this manager.",
+                    "longDescription": "This property shall indicate whether the protocol for the service is enabled.",
                     "readonly": false,
                     "type": "boolean"
                 }
@@ -741,6 +761,6 @@
         }
     },
     "owningEntity": "DMTF",
-    "release": "2018.2",
-    "title": "#Manager.v1_5_1.Manager"
+    "release": "2019.2",
+    "title": "#Manager.v1_6_0.Manager"
 }
\ No newline at end of file