diff --git a/static/redfish/v1/JsonSchemas/EventService/EventService.json b/static/redfish/v1/JsonSchemas/EventService/EventService.json
index d3131db..8d9923d 100644
--- a/static/redfish/v1/JsonSchemas/EventService/EventService.json
+++ b/static/redfish/v1/JsonSchemas/EventService/EventService.json
@@ -1,7 +1,7 @@
 {
     "$ref": "#/definitions/EventService",
-    "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema.v1_4_0.json",
-    "copyright": "Copyright 2014-2018 Distributed Management Task Force, Inc. (DMTF). For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright",
+    "$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",
     "definitions": {
         "Actions": {
             "additionalProperties": false,
@@ -13,6 +13,7 @@
                     "type": [
                         "array",
                         "boolean",
+                        "integer",
                         "number",
                         "null",
                         "object",
@@ -25,20 +26,35 @@
                     "$ref": "#/definitions/SubmitTestEvent"
                 },
                 "Oem": {
-                    "$ref": "#/definitions/OemActions"
+                    "$ref": "#/definitions/OemActions",
+                    "description": "This property contains the available OEM specific actions for this resource.",
+                    "longDescription": "This property shall contain any additional OEM actions for this resource."
                 }
             },
             "type": "object"
         },
+        "EventFormatType": {
+            "enum": [
+                "Event",
+                "MetricReport"
+            ],
+            "enumDescriptions": {
+                "Event": "The subscription destination will receive JSON Bodies of the Resource Type Event.",
+                "MetricReport": "The subscription destination will receive JSON Bodies of the Resource Type MetricReport."
+            },
+            "type": "string"
+        },
         "EventService": {
             "additionalProperties": false,
             "description": "The Event Service resource contains properties for managing event subcriptions and generates the events sent to subscribers.  The resource has links to the actual collection of subscriptions (called Event Destinations).",
+            "longDescription": "This resource shall be used to represent an event service 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",
@@ -48,16 +64,16 @@
             },
             "properties": {
                 "@odata.context": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/context"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/context"
                 },
                 "@odata.etag": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/etag"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/etag"
                 },
                 "@odata.id": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/id"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/id"
                 },
                 "@odata.type": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_2.json#/definitions/type"
+                    "$ref": "http://redfish.dmtf.org/schemas/v1/odata.v4_0_3.json#/definitions/type"
                 },
                 "Actions": {
                     "$ref": "#/definitions/Actions",
@@ -68,13 +84,13 @@
                     "description": "This is the number of attempts an event posting is retried before the subscription is terminated.  This retry is at the service level, meaning the HTTP POST to the Event Destination was returned by the HTTP operation as unsuccessful (4xx or 5xx return code) or an HTTP timeout occurred this many times before the Event Destination subscription is terminated.",
                     "longDescription": "The value of this property shall be the number of retrys attempted for any given event to the subscription destination before the subscription is terminated.  This retry is at the service level, meaning the HTTP POST to the Event Destination was returned by the HTTP operation as unsuccessful (4xx or 5xx return code) or an HTTP timeout occurred this many times before the Event Destination subscription is terminated.",
                     "readonly": false,
-                    "type": "number"
+                    "type": "integer"
                 },
                 "DeliveryRetryIntervalSeconds": {
                     "description": "This represents the number of seconds between retry attempts for sending any given Event.",
                     "longDescription": "The value of this property shall be the interval in seconds between the retry attempts for any given event to the subscription destination.",
                     "readonly": false,
-                    "type": "number",
+                    "type": "integer",
                     "units": "s"
                 },
                 "Description": {
@@ -88,6 +104,22 @@
                     ],
                     "readonly": true
                 },
+                "EventFormatTypes": {
+                    "description": "Indicates the content types of the message that this service can send to the event destination.",
+                    "items": {
+                        "anyOf": [
+                            {
+                                "$ref": "http://redfish.dmtf.org/schemas/v1/EventDestination.json#/definitions/EventFormatType"
+                            },
+                            {
+                                "type": "null"
+                            }
+                        ]
+                    },
+                    "longDescription": "The value of this property shall indicate the the content types of the message that this service can send to the event destination.  If this property is not present, the EventFormatType shall be assumed to be Event.",
+                    "readonly": true,
+                    "type": "array"
+                },
                 "EventTypesForSubscription": {
                     "description": "This is the types of Events that can be subscribed to.",
                     "items": {
@@ -110,6 +142,35 @@
                     "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*."
                 },
+                "RegistryPrefixes": {
+                    "description": "A list of the Prefixes of the Message Registries that can be used for the RegistryPrefix property on a subscription.",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "The value of this property is the array of the Prefixes of the Message Registries that shall be allowed for an Event Subscription.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "ResourceTypes": {
+                    "description": "A list of @odata.type values (Schema names) that can be specified in a ResourceType on a subscription.",
+                    "items": {
+                        "type": [
+                            "string",
+                            "null"
+                        ]
+                    },
+                    "longDescription": "The value of this property shall specify an array of the valid @odata.type values that can be used for an Event Subscription.",
+                    "readonly": true,
+                    "type": "array"
+                },
+                "SSEFilterPropertiesSupported": {
+                    "$ref": "#/definitions/SSEFilterPropertiesSupported",
+                    "description": "Contains a set of properties that indicate which properties are supported in the $filter query parameter for the ServerSentEventUri.",
+                    "longDescription": "The value of this property shall contain a set of properties that indicate which properties are supported in the $filter query parameter for the URI indicated by the ServerSentEventUri property."
+                },
                 "ServerSentEventUri": {
                     "description": "Link to a URI for receiving Sever Sent Event representations of the events generated by this service.",
                     "format": "uri",
@@ -127,7 +188,18 @@
                     ]
                 },
                 "Status": {
-                    "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/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."
+                },
+                "SubordinateResourcesSupported": {
+                    "description": "This indicates if the service supports the SubordinateResource property on Event Subscriptions.",
+                    "longDescription": "When set to true, the service is indicating that it supports the SubordinateResource property on Event Subscriptions and on generated Events.",
+                    "readonly": true,
+                    "type": [
+                        "boolean",
+                        "null"
+                    ]
                 },
                 "Subscriptions": {
                     "$ref": "http://redfish.dmtf.org/schemas/v1/EventDestinationCollection.json#/definitions/EventDestinationCollection",
@@ -137,6 +209,8 @@
                 }
             },
             "required": [
+                "@odata.id",
+                "@odata.type",
                 "Id",
                 "Name"
             ],
@@ -152,6 +226,7 @@
                     "type": [
                         "array",
                         "boolean",
+                        "integer",
                         "number",
                         "null",
                         "object",
@@ -162,6 +237,70 @@
             "properties": {},
             "type": "object"
         },
+        "SSEFilterPropertiesSupported": {
+            "additionalProperties": false,
+            "description": "Contains a set of properties that indicate which properties are supported in the $filter query parameter for the ServerSentEventUri.",
+            "longDescription": "The type shall contain a set of properties that indicate which properties are supported in the $filter query parameter for the URI indicated by the ServerSentEventUri property.",
+            "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": {
+                "EventFormatType": {
+                    "description": "This indicates if the EventFormatType property is supported.",
+                    "longDescription": "The value of this property shall be a boolean indicating if this service supports the use of the EventFormatType property in the $filter query parameter as described by the specification.",
+                    "readonly": true,
+                    "type": "boolean"
+                },
+                "EventType": {
+                    "description": "This indicates if the EventType property is supported.",
+                    "longDescription": "The value of this property shall be a boolean indicating if this service supports the use of the EventType property in the $filter query parameter as described by the specification.",
+                    "readonly": true,
+                    "type": "boolean"
+                },
+                "MessageId": {
+                    "description": "This indicates if the MessageId property is supported.",
+                    "longDescription": "The value of this property shall be a boolean indicating if this service supports the use of the MessageId property in the $filter query parameter as described by the specification.",
+                    "readonly": true,
+                    "type": "boolean"
+                },
+                "MetricReportDefinition": {
+                    "description": "This indicates if the MetricReportDefinition property is supported.",
+                    "longDescription": "The value of this property shall be a boolean indicating if this service supports the use of the MetricReportDefinition property in the $filter query parameter as described by the specification.",
+                    "readonly": true,
+                    "type": "boolean"
+                },
+                "OriginResource": {
+                    "description": "This indicates if the OriginResource property is supported.",
+                    "longDescription": "The value of this property shall be a boolean indicating if this service supports the use of the OriginResource property in the $filter query parameter as described by the specification.",
+                    "readonly": true,
+                    "type": "boolean"
+                },
+                "RegistryPrefix": {
+                    "description": "This indicates if the RegistryPrefix property is supported.",
+                    "longDescription": "The value of this property shall be a boolean indicating if this service supports the use of the RegistryPrefix property in the $filter query parameter as described by the specification.",
+                    "readonly": true,
+                    "type": "boolean"
+                },
+                "ResourceType": {
+                    "description": "This indicates if the ResourceType property is supported.",
+                    "longDescription": "The value of this property shall be a boolean indicating if this service supports the use of the ResourceType property in the $filter query parameter as described by the specification.",
+                    "readonly": true,
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "SubmitTestEvent": {
             "additionalProperties": false,
             "description": "This action is used to generate a test event.",
@@ -208,8 +347,9 @@
                     "type": "string"
                 },
                 "OriginOfCondition": {
-                    "description": "This is the OriginOfCondition property of event to be added.",
-                    "longDescription": "This parameter shall have the same semantics as the OriginOfCondition property in the Event schema for Redfish.",
+                    "description": "This is the string of the URL within the OriginOfCondition property of the event to be added.  It is not a reference object.",
+                    "format": "uri",
+                    "longDescription": "This parameter shall be a string that represents the URL contained by the OriginOfCondition property in the Event schema for Redfish.",
                     "requiredParameter": true,
                     "type": "string"
                 },
@@ -226,6 +366,7 @@
                     "type": [
                         "array",
                         "boolean",
+                        "integer",
                         "number",
                         "null",
                         "object",
@@ -248,5 +389,5 @@
         }
     },
     "owningEntity": "DMTF",
-    "title": "#EventService.v1_1_0.EventService"
+    "title": "#EventService.v1_2_0.EventService"
 }
\ No newline at end of file