diff --git a/redfish-core/include/registries.hpp b/redfish-core/include/registries.hpp
index 411e9a0..e326323 100644
--- a/redfish-core/include/registries.hpp
+++ b/redfish-core/include/registries.hpp
@@ -34,6 +34,7 @@
     const char* description;
     const char* message;
     const char* severity;
+    const char* messageSeverity;
     const size_t numberOfArgs;
     std::array<const char*, 5> paramTypes;
     const char* resolution;
diff --git a/redfish-core/include/registries/base_message_registry.hpp b/redfish-core/include/registries/base_message_registry.hpp
index 6290198..90aef56 100644
--- a/redfish-core/include/registries/base_message_registry.hpp
+++ b/redfish-core/include/registries/base_message_registry.hpp
@@ -23,20 +23,20 @@
 namespace redfish::message_registries::base
 {
 const Header header = {
-    "Copyright 2014-2018 DMTF. All rights reserved.",
-    "#MessageRegistry.v1_0_0.MessageRegistry",
-    "Base.1.4.0",
+    "Copyright 2014-2020 DMTF. All rights reserved.",
+    "#MessageRegistry.v1_4_0.MessageRegistry",
+    "Base.1.8.1",
     "Base Message Registry",
     "en",
     "This registry defines the base messages for Redfish",
     "Base",
-    "1.4.0",
+    "1.8.1",
     "DMTF",
 };
 constexpr const char* url =
-    "https://redfish.dmtf.org/registries/Base.1.4.0.json";
+    "https://redfish.dmtf.org/registries/Base.1.8.1.json";
 
-constexpr std::array<MessageEntry, 58> registry = {
+constexpr std::array<MessageEntry, 73> registry = {
     MessageEntry{
         "AccessDenied",
         {
@@ -45,6 +45,7 @@
             "While attempting to establish a connection to %1, the service "
             "denied access.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -59,6 +60,7 @@
                      "The account for the current session has been removed, "
                      "thus the current session has been removed as well.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "Attempt to connect with a valid account.",
@@ -68,6 +70,7 @@
                      "Indicates that the account was successfully modified.",
                      "The account was successfully modified.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "No resolution is required.",
@@ -78,6 +81,7 @@
                      "account was not successful.",
                      "The account modification request failed.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "The modification may have failed due to permission "
@@ -88,6 +92,7 @@
                      "Indicates that the account was successfully removed.",
                      "The account was successfully removed.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "No resolution is required.",
@@ -99,6 +104,7 @@
             "supported by the resource.",
             "The action %1 is not supported by the resource.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -114,6 +120,7 @@
                      "The action %1 was submitted with more than one value for "
                      "the parameter %2.",
                      "Warning",
+                     "Warning",
                      2,
                      {
                          "string",
@@ -129,6 +136,7 @@
                      "The action %1 requires the parameter %2 to be present in "
                      "the request body.",
                      "Critical",
+                     "Critical",
                      2,
                      {
                          "string",
@@ -144,6 +152,7 @@
                      "The parameter %1 for the action %2 is not supported on "
                      "the target resource.",
                      "Warning",
+                     "Warning",
                      2,
                      {
                          "string",
@@ -159,6 +168,7 @@
             "did not match any of the known parameters.",
             "The action %1 was submitted with the invalid parameter %2.",
             "Warning",
+            "Warning",
             2,
             {
                 "string",
@@ -175,6 +185,7 @@
                      "The value %1 for the parameter %2 in the action %3 is of "
                      "a different format than the parameter can accept.",
                      "Warning",
+                     "Warning",
                      3,
                      {
                          "string",
@@ -192,6 +203,7 @@
                      "The value %1 for the parameter %2 in the action %3 is of "
                      "a different type than the parameter can accept.",
                      "Warning",
+                     "Warning",
                      3,
                      {
                          "string",
@@ -202,6 +214,35 @@
                      "and resubmit the request if the operation failed.",
                  }},
     MessageEntry{
+        "ChassisPowerStateOffRequired",
+        {
+            "Indicates that the request requires a specified Chassis to be "
+            "powered off.",
+            "The Chassis with Id '%1' requires to be powered off to perform "
+            "this request.",
+            "Warning",
+            "Warning",
+            1,
+            {
+                "string",
+            },
+            "Power off the specified Chassis and resubmit the request.",
+        }},
+    MessageEntry{"ChassisPowerStateOnRequired",
+                 {
+                     "Indicates that the request requires a specified Chassis "
+                     "to be powered on.",
+                     "The Chassis with Id '%1' requires to be powered on to "
+                     "perform this request.",
+                     "Warning",
+                     "Warning",
+                     1,
+                     {
+                         "string",
+                     },
+                     "Power on the specified Chassis and resubmit the request.",
+                 }},
+    MessageEntry{
         "CouldNotEstablishConnection",
         {
             "Indicates that the attempt to access the resource/file/image at "
@@ -209,6 +250,7 @@
             "established.",
             "The service failed to establish a connection with the URI %1.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -225,6 +267,7 @@
             "The create operation failed because the required property %1 was "
             "missing from the request.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -239,6 +282,7 @@
                      "The create operation failed because the resource has "
                      "reached the limit of possible resources.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "Either delete resources and resubmit the request if the "
@@ -250,6 +294,7 @@
                      "operation have been met.",
                      "The resource has been created successfully",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None",
@@ -262,6 +307,7 @@
             "The request body submitted contained an empty JSON object and the "
             "service is unable to process it.",
             "Warning",
+            "Warning",
             0,
             {},
             "Add properties in the JSON object and resubmit the request.",
@@ -276,6 +322,7 @@
             "The event subscription failed due to the number of simultaneous "
             "subscriptions exceeding the limit of the implementation.",
             "Critical",
+            "Critical",
             0,
             {},
             "Reduce the number of other subscriptions before trying to "
@@ -292,6 +339,7 @@
             "A general error has occurred. See Resolution for information on "
             "how to resolve the error.",
             "Critical",
+            "Critical",
             0,
             {},
             "None.",
@@ -306,6 +354,7 @@
             "associated with the current session to perform the requested "
             "operation.",
             "Critical",
+            "Critical",
             0,
             {},
             "Either abandon the operation or change the associated access "
@@ -319,6 +368,7 @@
             "The request failed due to an internal service error.  The service "
             "is still operational.",
             "Critical",
+            "Critical",
             0,
             {},
             "Resubmit the request.  If the problem persists, consider "
@@ -329,6 +379,7 @@
                      "The Index is not valid.",
                      "The Index %1 is not a valid offset into the array.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "number",
@@ -344,6 +395,7 @@
             "URI.",
             "The object at %1 is invalid.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -358,12 +410,25 @@
                      "The request body submitted was malformed JSON and could "
                      "not be parsed by the receiving service.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "Ensure that the request body is valid JSON and resubmit "
                      "the request.",
                  }},
     MessageEntry{
+        "MaximumErrorsExceeded",
+        {
+            "Indicates that sufficient errors have occurred that the reporting "
+            "service cannot return them all.",
+            "Too many errors have occurred to report them all.",
+            "Critical",
+            "Critical",
+            0,
+            {},
+            "Resolve other reported errors and retry the current operation.",
+        }},
+    MessageEntry{
         "NoOperation",
         {
             "Indicates that the requested operation will not perform any "
@@ -371,6 +436,7 @@
             "The request body submitted contain no data to act upon and no "
             "changes to the resource took place.",
             "Warning",
+            "Warning",
             0,
             {},
             "Add properties in the JSON object and resubmit the request.",
@@ -382,16 +448,96 @@
             "required in order to access any resources.",
             "There is no valid session established with the implementation.",
             "Critical",
+            "Critical",
             0,
             {},
-            "Establish as session before attempting any operations.",
+            "Establish a session before attempting any operations.",
         }},
+    MessageEntry{
+        "OperationFailed",
+        {
+            "Indicates that one of the internal operations necessary to "
+            "complete the request failed.  Examples of this are when an "
+            "internal service provider is unable to complete the request, such "
+            "as in aggregation or RDE.",
+            "An error occurred internal to the service as part of the overall "
+            "request.  Partial results may have been returned.",
+            "Warning",
+            "Warning",
+            0,
+            {},
+            "Resubmit the request.  If the problem persists, consider "
+            "resetting the service or provider.",
+        }},
+    MessageEntry{"OperationTimeout",
+                 {
+                     "Indicates that one of the internal operations necessary "
+                     "to complete the request timed out.  Examples of this are "
+                     "when an internal service provider is unable to complete "
+                     "the request, such as in aggregation or RDE.",
+                     "A timeout internal to the service occured as part of the "
+                     "request.  Partial results may have been returned.",
+                     "Warning",
+                     "Warning",
+                     0,
+                     {},
+                     "Resubmit the request.  If the problem persists, consider "
+                     "resetting the service or provider.",
+                 }},
+    MessageEntry{
+        "PasswordChangeRequired",
+        {
+            "Indicates that the password for the account provided must be "
+            "changed before accessing the service.  The password can be "
+            "changed with a PATCH to the 'Password' property in the "
+            "ManagerAccount resource instance.  Implementations that provide a "
+            "default password for an account may require a password change "
+            "prior to first access to the service.",
+            "The password provided for this account must be changed before "
+            "access is granted.  PATCH the 'Password' property for this "
+            "account located at the target URI '%1' to complete this process.",
+            "Critical",
+            "Critical",
+            1,
+            {
+                "string",
+            },
+            "Change the password for this account using a PATCH to the "
+            "'Password' property at the URI provided.",
+        }},
+    MessageEntry{"PreconditionFailed",
+                 {
+                     "Indicates that the ETag supplied did not match the "
+                     "current ETag of the resource.",
+                     "The ETag supplied did not match the ETag required to "
+                     "change this resource.",
+                     "Critical",
+                     "Critical",
+                     0,
+                     {},
+                     "Try the operation again using the appropriate ETag.",
+                 }},
+    MessageEntry{"PreconditionRequired",
+                 {
+                     "Indicates that the request did not provide the required "
+                     "precondition such as an If-Match or If-None-Match "
+                     "header, or @odata.etag annotations.",
+                     "A precondition header or annotation is required to "
+                     "change this resource.",
+                     "Critical",
+                     "Critical",
+                     0,
+                     {},
+                     "Try the operation again using an If-Match or "
+                     "If-None-Match header and appropriate ETag.",
+                 }},
     MessageEntry{"PropertyDuplicate",
                  {
                      "Indicates that a duplicate property was included in the "
                      "request body.",
                      "The property %1 was duplicated in the request.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -407,6 +553,7 @@
             "The property %1 is a required property and must be included in "
             "the request.",
             "Warning",
+            "Warning",
             1,
             {
                 "string",
@@ -421,6 +568,7 @@
                      "The property %1 is a read only property and cannot be "
                      "assigned a value.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -435,6 +583,7 @@
                      "The property %1 is not in the list of valid properties "
                      "for the resource.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -442,6 +591,22 @@
                      "Remove the unknown property from the request body and "
                      "resubmit the request if the operation failed.",
                  }},
+    MessageEntry{
+        "PropertyValueConflict",
+        {
+            "Indicates that the requested write of a property value could not "
+            "be completed, because of a conflict with another property value.",
+            "The property '%1' could not be written because its value would "
+            "conflict with the value of the '%2' property.",
+            "Warning",
+            "Warning",
+            2,
+            {
+                "string",
+                "string",
+            },
+            "No resolution is required.",
+        }},
     MessageEntry{"PropertyValueFormatError",
                  {
                      "Indicates that a property was given the correct value "
@@ -449,6 +614,7 @@
                      "The value %1 for the property %2 is of a different "
                      "format than the property can accept.",
                      "Warning",
+                     "Warning",
                      2,
                      {
                          "string",
@@ -457,6 +623,25 @@
                      "Correct the value for the property in the request body "
                      "and resubmit the request if the operation failed.",
                  }},
+    MessageEntry{"PropertyValueIncorrect",
+                 {
+                     "Indicates that the requested write of a property value "
+                     "could not be completed, because of an incorrect value of "
+                     "the property.  Examples include values that do not match "
+                     "a regular expression requirement or passwords that do "
+                     "not match the implementation constraints.",
+                     "The property '%1' with the requested value of '%2' could "
+                     "not be written because the value does not meet the "
+                     "constraints of the implementation.",
+                     "Warning",
+                     "Warning",
+                     2,
+                     {
+                         "string",
+                         "string",
+                     },
+                     "No resolution is required.",
+                 }},
     MessageEntry{"PropertyValueModified",
                  {
                      "Indicates that a property was given the correct value "
@@ -465,6 +650,7 @@
                      "The property %1 was assigned the value %2 due to "
                      "modification by the service.",
                      "Warning",
+                     "Warning",
                      2,
                      {
                          "string",
@@ -481,6 +667,7 @@
             "The value %1 for the property %2 is not in the list of acceptable "
             "values.",
             "Warning",
+            "Warning",
             2,
             {
                 "string",
@@ -497,6 +684,7 @@
             "The value %1 for the property %2 is of a different type than the "
             "property can accept.",
             "Warning",
+            "Warning",
             2,
             {
                 "string",
@@ -506,11 +694,39 @@
             "resubmit the request if the operation failed.",
         }},
     MessageEntry{
+        "QueryCombinationInvalid",
+        {
+            "Indicates the request contains multiple query parameters, and "
+            "that two or more of them cannot be used together.",
+            "Two or more query parameters in the request cannot be used "
+            "together.",
+            "Warning",
+            "Warning",
+            0,
+            {},
+            "Remove one or more of the query parameters and resubmit the "
+            "request if the operation failed.",
+        }},
+    MessageEntry{
         "QueryNotSupported",
         {
             "Indicates that query is not supported on the implementation.",
             "Querying is not supported by the implementation.",
             "Warning",
+            "Warning",
+            0,
+            {},
+            "Remove the query parameters and resubmit the request if the "
+            "operation failed.",
+        }},
+    MessageEntry{
+        "QueryNotSupportedOnOperation",
+        {
+            "Indicates that query is not supported with the given operation, "
+            "such as when an expand query is attemped with a PATCH operation.",
+            "Querying is not supported with the requested operation.",
+            "Warning",
+            "Warning",
             0,
             {},
             "Remove the query parameters and resubmit the request if the "
@@ -523,6 +739,7 @@
                      "on a resource that is not a collection.",
                      "Querying is not supported on the requested resource.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "Remove the query parameters and resubmit the request if "
@@ -537,6 +754,7 @@
             "such as when a page is requested that is beyond the last page.",
             "The value %1 for the query parameter %2 is out of range %3.",
             "Warning",
+            "Warning",
             3,
             {
                 "string",
@@ -556,6 +774,7 @@
                      "The value %1 for the parameter %2 is of a different "
                      "format than the parameter can accept.",
                      "Warning",
+                     "Warning",
                      2,
                      {
                          "string",
@@ -572,6 +791,7 @@
                      "The value %1 for the query parameter %2 is of a "
                      "different type than the parameter can accept.",
                      "Warning",
+                     "Warning",
                      2,
                      {
                          "string",
@@ -580,6 +800,22 @@
                      "Correct the value for the query parameter in the request "
                      "and resubmit the request if the operation failed.",
                  }},
+    MessageEntry{
+        "ResetRequired",
+        {
+            "Indicates that a component reset is required for changes or "
+            "operations to complete.",
+            "In order to complete the operation, a component reset is required "
+            "with the Reset action URI '%1' and ResetType '%2'.",
+            "Warning",
+            "Warning",
+            2,
+            {
+                "string",
+                "string",
+            },
+            "Perform the required Reset action on the specified component.",
+        }},
     MessageEntry{"ResourceAlreadyExists",
                  {
                      "Indicates that a resource change or creation was "
@@ -588,6 +824,7 @@
                      "The requested resource of type %1 with the property %2 "
                      "with the value %3 already exists.",
                      "Critical",
+                     "Critical",
                      3,
                      {
                          "string",
@@ -604,6 +841,7 @@
             "that URI was in a format not supported by the service.",
             "The resource at %1 is in a format not recognized by the service.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -618,6 +856,7 @@
                      "While accessing the resource at %1, the service received "
                      "an authorization error %2.",
                      "Critical",
+                     "Critical",
                      2,
                      {
                          "string",
@@ -633,11 +872,28 @@
                      "The delete request failed because the resource requested "
                      "cannot be deleted.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "Do not attempt to delete a non-deletable resource.",
                  }},
     MessageEntry{
+        "ResourceCreationConflict",
+        {
+            "Indicates that the requested resource creation could not be "
+            "completed because the service has a resource that conflicts with "
+            "the request.",
+            "The resource could not be created.  The service has a resource at "
+            "URI '%1' that conflicts with the creation request.",
+            "Warning",
+            "Warning",
+            1,
+            {
+                "string",
+            },
+            "No resolution is required.",
+        }},
+    MessageEntry{
         "ResourceExhaustion",
         {
             "Indicates that a resource could not satisfy the request due to "
@@ -646,6 +902,7 @@
             "The resource %1 was unable to satisfy the request due to "
             "unavailability of resources.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -659,6 +916,7 @@
                      "The request could not be performed because the resource "
                      "is in standby.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "Ensure that the resource is in the correct power state "
@@ -672,6 +930,7 @@
                      "The change to the requested resource failed because the "
                      "resource is in use or in transition.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "Remove the condition and resubmit the request if the "
@@ -685,6 +944,7 @@
             "requests that require URIs like Firmware Update.",
             "The resource at the URI %1 was not found.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -699,6 +959,7 @@
             "corresponds to an existing resource but one was not found.",
             "The requested resource of type %1 named %2 was not found.",
             "Critical",
+            "Critical",
             2,
             {
                 "string",
@@ -717,6 +978,7 @@
             "The @odata.type of the request body %1 is incompatible with the "
             "@odata.type of the resource which is %2.",
             "Critical",
+            "Critical",
             2,
             {
                 "string",
@@ -733,6 +995,7 @@
             "The operation failed because the service is in an unknown state "
             "and can no longer take incoming requests.",
             "Critical",
+            "Critical",
             0,
             {},
             "Restart the service and resubmit the request if the operation "
@@ -745,6 +1008,7 @@
                      "The operation failed because the service is shutting "
                      "down and can no longer take incoming requests.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "When the service becomes available, resubmit the request "
@@ -756,6 +1020,7 @@
             "Indicates the service is temporarily unavailable.",
             "The service is temporarily unavailable.  Retry in %1 seconds.",
             "Critical",
+            "Critical",
             1,
             {
                 "string",
@@ -771,6 +1036,7 @@
             "The session establishment failed due to the number of "
             "simultaneous sessions exceeding the limit of the implementation.",
             "Critical",
+            "Critical",
             0,
             {},
             "Reduce the number of other sessions before trying to establish "
@@ -784,6 +1050,7 @@
             "resulted in the successful termination of the session.",
             "The session was successfully terminated.",
             "OK",
+            "OK",
             0,
             {},
             "No resolution is required.",
@@ -797,6 +1064,7 @@
             "The other end of the connection at %1 does not support the "
             "specified protocol %2.",
             "Critical",
+            "Critical",
             2,
             {
                 "string",
@@ -812,6 +1080,7 @@
                      "allowed by the specification.",
                      "The string %1 exceeds the length limit %2.",
                      "Warning",
+                     "Warning",
                      2,
                      {
                          "string",
@@ -819,12 +1088,24 @@
                      },
                      "Resubmit the request with an appropriate string length.",
                  }},
+    MessageEntry{"SubscriptionTerminated",
+                 {
+                     "An event subscription has been terminated by the "
+                     "Service. No further events will be delivered.",
+                     "The event subscription has been terminated.",
+                     "OK",
+                     "OK",
+                     0,
+                     {},
+                     "No resolution is required.",
+                 }},
     MessageEntry{"Success",
                  {
                      "Indicates that all conditions of a successful operation "
                      "have been met.",
                      "Successfully Completed Request",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None",
@@ -837,6 +1118,7 @@
             "The service detected a malformed request body that it was unable "
             "to interpret.",
             "Warning",
+            "Warning",
             0,
             {},
             "Correct the request body and resubmit the request if it failed.",
diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp
index ec0f068..236002e 100644
--- a/redfish-core/include/registries/openbmc_message_registry.hpp
+++ b/redfish-core/include/registries/openbmc_message_registry.hpp
@@ -20,7 +20,7 @@
 {
 const Header header = {
     "Copyright 2018 OpenBMC. All rights reserved.",
-    "#MessageRegistry.v1_0_0.MessageRegistry",
+    "#MessageRegistry.v1_4_0.MessageRegistry",
     "OpenBMC.0.1.0",
     "OpenBMC Message Registry",
     "en",
@@ -36,6 +36,7 @@
             "Indicates an ADDDC Correctable Error.",
             "ADDDC Correctable Error.Socket=%1 Channel=%2 DIMM=%3 Rank=%4.",
             "Warning",
+            "Warning",
             4,
             {
                 "number",
@@ -51,6 +52,7 @@
             "Indicates that At-Scale Debug enable is detected in hardware.",
             "At-Scale Debug Feature is enabled in hardware.",
             "Critical",
+            "Critical",
             0,
             {},
             "None.",
@@ -61,6 +63,7 @@
             "Indicates that At-Scale Debug disable is detected in hardware.",
             "At-Scale Debug Feature is disabled in hardware.",
             "OK",
+            "OK",
             0,
             {},
             "None.",
@@ -70,6 +73,7 @@
                      "Indicates that At-Scale Debug service is started.",
                      "At-Scale Debug service is started.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -79,6 +83,7 @@
                      "Indicates that At-Scale Debug service is stopped.",
                      "At-Scale Debug service is stopped.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -88,6 +93,7 @@
                      "Indicates At-Scale Debug connection has been established",
                      "At-Scale Debug service is now connected %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -97,6 +103,7 @@
                      "Indicates At-Scale Debug connection has ended",
                      "At-Scale Debug service is now disconnected",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -106,6 +113,7 @@
                      "Indicates At-Scale Debug connection aborted/failed",
                      "At-Scale Debug connection aborted/failed",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -115,6 +123,7 @@
                      "Indicates that special user is enabled.",
                      "At-Scale Debug special user is enabled",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -124,6 +133,7 @@
                      "Indicates that special user is disabled.",
                      "At-Scale Debug special user is disabled",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -135,6 +145,7 @@
             "Indicates BIOS has transitioned control to the OS Loader.",
             "BIOS System Boot.",
             "OK",
+            "OK",
             0,
             {},
             "None.",
@@ -144,6 +155,7 @@
                      "Indicates the reason for BIOS firmware panic.",
                      "BIOS firmware panic occurred due to %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -155,6 +167,7 @@
                      "Indicates the reason for BIOS firmware recovery.",
                      "BIOS firmware recovery occurred due to %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -166,6 +179,7 @@
                      "Indicates BIOS firmware encountered resilience error.",
                      "BIOS firmware resiliency error. Error reason: %1.",
                      "Critical",
+                     "Critical",
                      1,
                      {
                          "string",
@@ -177,6 +191,7 @@
                      "BIOS Power-On Self-Test Code received",
                      "Boot Count: %1: TS Offset: %2; POST Code: %3",
                      "OK",
+                     "OK",
                      3,
                      {"number", "number", "number"},
                      "None.",
@@ -186,6 +201,7 @@
                      "Indicates BIOS POST has encountered an error.",
                      "BIOS POST Error. Error Code=%1",
                      "Warning",
+                     "Warning",
                      1,
                      {"number"},
                      "None.",
@@ -195,6 +211,7 @@
                      "Indicates BIOS Recovery has completed.",
                      "BIOS Recovery Complete.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -204,6 +221,7 @@
                      "Indicates BIOS Recovery has started.",
                      "BIOS Recovery Start.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -213,6 +231,7 @@
                      "Indicates that BMC kernel panic occurred.",
                      "BMC rebooted due to kernel panic.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -222,6 +241,7 @@
                      "Indicates the reason for last BMC firmware panic.",
                      "BMC firmware panic occurred due to %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -233,6 +253,7 @@
                      "Indicates the reason for last BMC firmware recovery.",
                      "BMC firmware recovery occurred due to %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -244,6 +265,7 @@
                      "Indicates BMC firmware encountered resilience error.",
                      "BMC firmware resiliency error. Error reason: %1.",
                      "Critical",
+                     "Critical",
                      1,
                      {
                          "string",
@@ -256,6 +278,7 @@
                      "of the chassis intrusion has occurred.",
                      "Chassis Intrusion Detected.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -265,6 +288,7 @@
                      "Indicates that chassis intrusion status has recovered.",
                      "Chassis Intrusion Reset.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -274,6 +298,7 @@
                      "Indicates the reason for CPLD firmware panic.",
                      "CPLD firmware panic occurred due to %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -285,6 +310,7 @@
                      "Indicates the reason for CPLD firmware recovery.",
                      "CPLD firmware recovery occurred due to %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -296,6 +322,7 @@
                      "Indicates CPLD firmware encountered resilience error.",
                      "CPLD firmware resiliency error. Error reason: %1.",
                      "Critical",
+                     "Critical",
                      1,
                      {
                          "string",
@@ -308,6 +335,7 @@
                      "the specified type or cause.",
                      "CPU Error Occurred: %1.",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -318,6 +346,7 @@
                      "rating is incompatible with the board.",
                      "CPU %1 Mismatch.",
                      "Critical",
+                     "Critical",
                      1,
                      {"number"},
                      "Install the supported CPU.",
@@ -328,6 +357,7 @@
                      "trip has been asserted.",
                      "CPU %1 Thermal Trip.",
                      "Critical",
+                     "Critical",
                      1,
                      {"number"},
                      "None.",
@@ -337,6 +367,7 @@
                      "Indicates that the system DC power is off.",
                      "Host system DC power is off",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -346,6 +377,7 @@
                      "Indicates that the system DC power is on.",
                      "Host system DC power is on",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -356,6 +388,7 @@
                      "the specified type or cause.",
                      "Drive Error Occurred: %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -365,6 +398,7 @@
                      "Indicates that the event log has been cleared.",
                      "Event Log Cleared.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -374,6 +408,7 @@
                      "Indicates that a system fan has been inserted.",
                      "%1 inserted.",
                      "OK",
+                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -383,6 +418,7 @@
                      "Indicates that system fan redundancy has been lost.",
                      "Fan redundancy lost.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -392,6 +428,7 @@
                      "Indicates that system fan redundancy has been regained.",
                      "Fan redundancy regained.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -401,6 +438,7 @@
                      "Indicates that a system fan has been removed.",
                      "%1 removed.",
                      "OK",
+                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -411,6 +449,7 @@
                      "%1 firmware update to version %2 completed "
                      "successfully.",
                      "OK",
+                     "OK",
                      2,
                      {"string", "string"},
                      "None.",
@@ -420,6 +459,7 @@
                      "Indicates a firmware update has failed.",
                      "%1 firmware update to version %2 failed: %3.",
                      "Warning",
+                     "Warning",
                      3,
                      {"string", "string", "string"},
                      "None.",
@@ -429,6 +469,7 @@
                      "Indicates a firmware update has started.",
                      "%1 firmware update to version %2 started.",
                      "OK",
+                     "OK",
                      2,
                      {"string", "string"},
                      "None.",
@@ -439,6 +480,7 @@
             "Indicates a general firmware security violation has occurred.",
             "Firmware security violation: %1.",
             "Critical",
+            "Critical",
             1,
             {"string"},
             "None.",
@@ -449,6 +491,7 @@
                      "interface with an invalid username or password.",
                      "Invalid username or password attempted on %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -458,6 +501,7 @@
                      "Indicates that the uploaded file was invalid.",
                      "Invalid file uploaded to %1: %2.",
                      "Warning",
+                     "Warning",
                      2,
                      {"string", "string"},
                      "None.",
@@ -469,6 +513,7 @@
             "type, and serial number was installed.",
             "%1 %2 with serial number %3 was installed.",
             "OK",
+            "OK",
             3,
 
             {
@@ -485,6 +530,7 @@
             "type, and serial number was removed.",
             "%1 %2 with serial number %3 was removed.",
             "OK",
+            "OK",
             3,
 
             {
@@ -500,6 +546,7 @@
             "Indicates Intel UPI link width has reduced to half width.",
             "Intel UPI link width reduced to half. Node=%1.",
             "Warning",
+            "Warning",
             1,
 
             {
@@ -513,6 +560,7 @@
             "Indicates Intel UPI link width has reduced to quarter width.",
             "Intel UPI link width reduced to quarter. Node=%1.",
             "Warning",
+            "Warning",
             1,
 
             {
@@ -526,6 +574,7 @@
                      "Indicates that there is a host watchdog event.",
                      "Host Watchdog Event: %1",
                      "OK",
+                     "OK",
                      1,
 
                      {
@@ -539,6 +588,7 @@
                      "of the LAN leash has lost.",
                      "%1 LAN leash lost.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -550,6 +600,7 @@
                      "Indicates that LAN link status has reconnected.",
                      "%1 LAN leash regained.",
                      "OK",
+                     "OK",
                      1,
                      {
                          "string",
@@ -561,6 +612,7 @@
                      "Indicates a Legacy PCI PERR.",
                      "Legacy PCI PERR. Bus=%1 Device=%2 Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -575,6 +627,7 @@
                      "Indicates a Legacy PCI SERR.",
                      "Legacy PCI SERR. Bus=%1 Device=%2 Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -590,6 +643,7 @@
                      "or Manufacturing mode.",
                      "Entered Manufacturing Mode.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -600,6 +654,7 @@
                      "or Manufacturing mode.",
                      "Exited Manufacturing Mode.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -612,6 +667,7 @@
                      "monitoring, limiting and HW protection features might "
                      "be unavailable. Failure reason: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "Ensure that Intel ME configuration for power "
@@ -626,6 +682,7 @@
             "Determined sources for domain readings are: DC Power: %1 ; "
             "Chassis Power: %2 ; PSU Efficiency: %3 ; Unamanaged power: %4",
             "OK",
+            "OK",
             4,
             {"string", "string", "string", "string"},
             "None.",
@@ -637,6 +694,7 @@
                      "Intel ME has detected following issue with Intel Boot "
                      "Guard: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -647,6 +705,7 @@
                      "which CPU Debug Capability is disabled.",
                      "CPU Debug Capability disabled",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -658,6 +717,7 @@
                      "Intel ME Firmware switched to recovery mode to perform "
                      "full update from BIOS.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "This is transient state. Intel ME Firmware should "
@@ -673,6 +733,7 @@
             "failure action and Intel ME forced shutdown. BMC probably did "
             "not respond correctly to Chassis Control.",
             "Warning",
+            "Warning",
             0,
             {},
             "Verify the Intel Node Manager policy configuration.",
@@ -684,6 +745,7 @@
             "Intel ME has performed automatic reset to factory "
             "presets due to following reason: %1",
             "Critical",
+            "Critical",
             1,
             {"string"},
             "If error is persistent the Flash device must be replaced.",
@@ -695,6 +757,7 @@
             "Intel ME has performed automatic reset to factory "
             "presets due to following reason: %1",
             "OK",
+            "OK",
             1,
             {"string"},
             "If error is persistent the Flash device must be replaced.",
@@ -706,6 +769,7 @@
             "exception during execution.",
             "Intel ME has encountered firmware exception. Error code = %1",
             "Warning",
+            "Warning",
             1,
             {"string"},
             "Restore factory presets using Force ME Recovery IPMI "
@@ -721,6 +785,7 @@
                      "Indicates the reason for ME firmware panic.",
                      "ME firmware panic occurred due to %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -732,6 +797,7 @@
                      "Indicates the reason for ME firmware recovery.",
                      "ME firmware recovery occurred due to %1.",
                      "Warning",
+                     "Warning",
                      1,
                      {
                          "string",
@@ -743,6 +809,7 @@
                      "Indicates ME firmware encountered resilience error.",
                      "ME firmware resiliency error. Error reason: %1.",
                      "Critical",
+                     "Critical",
                      1,
                      {
                          "string",
@@ -757,6 +824,7 @@
                      "Intel ME has encountered an error during Flash erasure "
                      "procedure probably due to Flash part corruption.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "The Flash device must be replaced.",
@@ -768,6 +836,7 @@
                      "Intel ME has encountered problem during IO to flash "
                      "device. Reason: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "If flash wear-out protection occurred wait until it "
@@ -780,6 +849,7 @@
                      "Intel ME has encountered problem during IO to flash "
                      "device. Reason: %1",
                      "OK",
+                     "OK",
                      1,
                      {"string"},
                      "If flash wear-out protection occurred wait until it "
@@ -792,6 +862,7 @@
                      "Intel ME has detected invalid flash descriptor region. "
                      "Following error is detected: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "Flash Descriptor Region must be created correctly.",
@@ -804,6 +875,7 @@
             "Warning threshold for number of flash operations has been "
             "exceeded. Current percentage of write operations capacity: %1",
             "Warning",
+            "Warning",
             1,
             {"number"},
             "No immediate repair action needed.",
@@ -818,6 +890,7 @@
             "may be either caused by Flash device corruption or "
             "failed upgrade procedure.",
             "Critical",
+            "Critical",
             0,
             {},
             "Either the Flash device must be replaced (if error is "
@@ -832,6 +905,7 @@
             "Error during Intel ME execution. Watchdog "
             "timeout has expired.",
             "Critical",
+            "Critical",
             0,
             {},
             "Firmware should automatically recover from error state. "
@@ -845,6 +919,7 @@
                      "Wrong manufacturing configuration detected by Intel ME "
                      "Firmware. Unable to start operational mode. Reason: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      " If error is persistent the Flash device must be "
@@ -860,6 +935,7 @@
                      "when MCTP was not configured by BIOS or a defect which "
                      "may need a Host reset to recover from. Details: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "Recovery via CPU Host reset or platform reset. If error "
@@ -872,6 +948,7 @@
                      "Memory ECC correctable error. Socket=%1 "
                      "Channel=%2 DIMM=%3 Rank=%4.",
                      "Warning",
+                     "Warning",
                      4,
 
                      {
@@ -888,6 +965,7 @@
                      "Memory ECC uncorrectable error. Socket=%1 Channel=%2 "
                      "DIMM=%3 Rank=%4.",
                      "Critical",
+                     "Critical",
                      4,
 
                      {
@@ -904,6 +982,7 @@
                      "Command and Address parity error. Socket=%1 Channel=%2 "
                      "DIMM=%3 ChannelValid=%4 DIMMValid=%5.",
                      "Critical",
+                     "Critical",
                      5,
 
                      {
@@ -921,6 +1000,7 @@
                      "Memory parity error. Socket=%1 Channel=%2 "
                      "DIMM=%3 ChannelValid=%4 DIMMValid=%5.",
                      "Critical",
+                     "Critical",
                      5,
 
                      {
@@ -937,6 +1017,7 @@
                      "Indicates Memory RAS Disabled Configuration Status.",
                      "Memory RAS Configuration Disabled. Error=%1 Mode=%2.",
                      "OK",
+                     "OK",
                      2,
 
                      {
@@ -950,6 +1031,7 @@
                      "Indicates Memory RAS Enabled Configuration Status.",
                      "Memory RAS Configuration Enabled. Error=%1 Mode=%2.",
                      "OK",
+                     "OK",
                      2,
 
                      {
@@ -964,6 +1046,7 @@
                      "Memory RAS Mode Select Disabled. Prior Mode=%1 "
                      "Selected Mode=%2.",
                      "OK",
+                     "OK",
                      2,
 
                      {
@@ -978,6 +1061,7 @@
                      "Memory RAS Mode Select Enabled. Prior Mode=%1 Selected "
                      "Mode=%2.",
                      "OK",
+                     "OK",
                      2,
 
                      {
@@ -992,6 +1076,7 @@
                      "by the specified component.",
                      "Memory ThermTrip asserted: %1.",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -1002,6 +1087,7 @@
                      "problems in initializing Multi-PCH mode.",
                      "Intel ME error in Multi-PCH mode: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -1017,6 +1103,7 @@
             "BIOS or a defect which may require a CPU Host reset to "
             "recover from. Details: %1",
             "Critical",
+            "Critical",
             1,
             {"string"},
             "Recovery via CPU Host reset or platform reset. If error is "
@@ -1028,6 +1115,7 @@
             "Indicates that Intel ME has encountered issue with Intel PTT",
             "Intel ME has detected following issue with Intel PTT: %1",
             "Warning",
+            "Warning",
             1,
             {"string"},
             "None.",
@@ -1041,6 +1129,7 @@
             "pin asserted. Pin number is configurable in factory "
             "presets, Default recovery pin is MGPIO1.",
             "OK",
+            "OK",
             0,
             {},
             "Deassert recovery GPIO and reset the Intel ME back to "
@@ -1053,6 +1142,7 @@
                      "Indicates events related to Intel ME restricted mode.",
                      "Intel ME restricted mode information: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "None.",
@@ -1064,6 +1154,7 @@
             "Intel ME has detected SMBus link error. "
             "Sensor Bus: %1 , MUX Address: %2 ",
             "Critical",
+            "Critical",
             2,
             {"string", "string"},
             "Devices connected to given SMLINK might cause communication "
@@ -1076,6 +1167,7 @@
             "Indicates that Intel ME has encountered UMA operation error.",
             "Intel ME has encountered UMA operation error. Details: %1",
             "Critical",
+            "Critical",
             1,
             {"string"},
             "Platform reset when UMA not configured correctly, or when "
@@ -1090,6 +1182,7 @@
                      "Feature not supported in current segment detected by "
                      "Intel ME Firmware. Details: %1",
                      "Critical",
+                     "Critical",
                      1,
                      {"string"},
                      "Proper FW configuration must be updated or use the "
@@ -1101,6 +1194,7 @@
                      "Mirroring redundancy state degraded. Socket=%1 "
                      "Channel=%2 DIMM=%3 Pair=%4 Rank=%5.",
                      "Warning",
+                     "Warning",
                      5,
 
                      {
@@ -1119,6 +1213,7 @@
             "Mirroring redundancy state fully redundant. Socket=%1 "
             "Channel=%2 DIMM=%3 Pair=%4 Rank=%5.",
             "OK",
+            "OK",
             5,
 
             {
@@ -1135,6 +1230,7 @@
                      "Indicates that the NMI button was pressed.",
                      "NMI Button Pressed.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1145,6 +1241,7 @@
                      "Interrupt has been generated.",
                      "NMI Diagnostic Interrupt.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1155,6 +1252,7 @@
                      "PCIe Correctable Advisory Non-fatal Error. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1170,6 +1268,7 @@
 
                      "PCIe Correctable Bad DLLP. Bus=%1 Device=%2 Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1185,6 +1284,7 @@
 
                      "PCIe Correctable Bad TLP. Bus=%1 Device=%2 Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1200,6 +1300,7 @@
                      "PCIe Correctable Header Log Overflow. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1215,6 +1316,7 @@
                      "PCIe Correctable Internal Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1230,6 +1332,7 @@
                      "PCIe Correctable Link BW Changed. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1245,6 +1348,7 @@
                      "PCIe Correctable Receiver Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1260,6 +1364,7 @@
                      "PCIe Correctable Replay Num Rollover. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1275,6 +1380,7 @@
                      "PCIe Correctable Replay Timer Timeout. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1290,6 +1396,7 @@
                      "PCIe Correctable Unspecified AER Error. "
                      "Bus=%1 Device=%2 Function=%3.",
                      "Warning",
+                     "Warning",
                      3,
 
                      {
@@ -1305,6 +1412,7 @@
 
                      "PCIe Fatal ACS Violation. Bus=%1 Device=%2 Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1320,6 +1428,7 @@
                      "PCIe Fatal Atomic Egress Blocked. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1336,6 +1445,7 @@
 
             "PCIe Fatal Completer Abort. Bus=%1 Device=%2 Function=%3.",
             "Critical",
+            "Critical",
             3,
 
             {
@@ -1352,6 +1462,7 @@
 
             "PCIe Fatal Completion Timeout. Bus=%1 Device=%2 Function=%3.",
             "Critical",
+            "Critical",
             3,
 
             {
@@ -1369,6 +1480,7 @@
             "PCIe Fatal Data Link Layer Protocol Error. Bus=%1 Device=%2 "
             "Function=%3.",
             "Critical",
+            "Critical",
             3,
 
             {
@@ -1383,6 +1495,7 @@
                      "Indicates a PCIe ECRC Error.",
                      "PCIe Fatal ECRC Error. Bus=%1 Device=%2 Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1399,6 +1512,7 @@
                      "PCIe Fatal Flow Control Protocol Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1415,6 +1529,7 @@
 
             "PCIe Fatal Malformed TLP Error. Bus=%1 Device=%2 Function=%3.",
             "Critical",
+            "Critical",
             3,
 
             {
@@ -1430,6 +1545,7 @@
                      "PCIe Fatal MC Blocked TLP Error. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1446,6 +1562,7 @@
 
             "PCIe Fatal Poisoned TLP Error. Bus=%1 Device=%2 Function=%3.",
             "Critical",
+            "Critical",
             3,
 
             {
@@ -1461,6 +1578,7 @@
                      "PCIe Fatal Receiver Buffer Overflow. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1478,6 +1596,7 @@
             "PCIe Fatal Received ERR_NONFATAL Message. Bus=%1 Device=%2 "
             "Function=%3.",
             "Critical",
+            "Critical",
             3,
 
             {
@@ -1495,6 +1614,7 @@
                      "PCIe Fatal Received Fatal Message From Downstream. "
                      "Bus=%1 Device=%2 Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1510,6 +1630,7 @@
                      "PCIe Fatal Surprise Link Down Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1525,6 +1646,7 @@
                      "PCIe Fatal TLP Prefix Blocked Error. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1542,6 +1664,7 @@
             "PCIe Fatal Uncorrectable Internal Error. Bus=%1 Device=%2 "
             "Function=%3.",
             "Critical",
+            "Critical",
             3,
 
             {
@@ -1557,6 +1680,7 @@
                      "PCIe Fatal Unexpected Completion. Bus=%1 Device=%2 "
                      "Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1572,6 +1696,7 @@
                      "PCIe Fatal Unspecified Non-AER Fatal Error. Bus=%1 "
                      "Device=%2 Function=%3.",
                      "Critical",
+                     "Critical",
                      3,
 
                      {
@@ -1588,6 +1713,7 @@
 
             "PCIe Fatal Unsupported Request. Bus=%1 Device=%2 Function=%3.",
             "Critical",
+            "Critical",
             3,
 
             {
@@ -1602,6 +1728,7 @@
                      "Indicates that the power button was pressed.",
                      "Power Button Pressed.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -1612,6 +1739,7 @@
                      "BMC has applied the restore policy.",
                      "Power restore policy applied.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -1621,6 +1749,7 @@
                      "Indicates an error in power supply configuration.",
                      "Power supply %1 configuration error.",
                      "Warning",
+                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1632,6 +1761,7 @@
             "from a failure.",
             "Power supply %1 configuration error recovered.",
             "OK",
+            "OK",
             1,
             {"string"},
             "None.",
@@ -1642,6 +1772,7 @@
             "Indicates that the specified power supply fan has failed.",
             "Power supply %1 fan %2 failed.",
             "Warning",
+            "Warning",
             2,
             {"string", "string"},
             "None.",
@@ -1652,6 +1783,7 @@
             "Indicates that the power supply fan recovered from a failure.",
             "Power supply %1 fan %2 recovered.",
             "OK",
+            "OK",
             2,
             {"string", "string"},
             "None.",
@@ -1661,6 +1793,7 @@
                      "Indicates that a power supply has failed.",
                      "Power supply %1 failed.",
                      "Warning",
+                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1670,6 +1803,7 @@
                      "Indicates that a power supply is predicted to fail.",
                      "Power supply %1 failure predicted.",
                      "Warning",
+                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1679,6 +1813,7 @@
                      "Indicates that a power supply has been inserted.",
                      "Power supply %1 inserted.",
                      "OK",
+                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -1690,6 +1825,7 @@
                      "Power supply power good failed to assert within %1 "
                      "milliseconds.",
                      "Critical",
+                     "Critical",
                      1,
                      {"number"},
                      "None.",
@@ -1699,6 +1835,7 @@
                      "Indicates that a power supply has lost input power.",
                      "Power supply %1 power lost.",
                      "Warning",
+                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1708,6 +1845,7 @@
                      "Indicates that a power supply input power was restored.",
                      "Power supply %1 power restored.",
                      "OK",
+                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -1718,6 +1856,7 @@
                      "from a predicted failure.",
                      "Power supply %1 predicted failure recovered.",
                      "OK",
+                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -1727,6 +1866,7 @@
                      "Indicates that a power supply recovered from a failure.",
                      "Power supply %1 recovered.",
                      "OK",
+                     "OK",
                      1,
                      {"string"},
                      "None.",
@@ -1736,6 +1876,7 @@
                      "Indicates that a power supply has been removed.",
                      "Power supply %1 removed.",
                      "Warning",
+                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -1746,6 +1887,7 @@
                      "nonredundant but is still not in full redundancy mode.",
                      "Power Unit degraded from nonredundant.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -1756,6 +1898,7 @@
                      "redundancy mode.",
                      "Power Unit degraded from redundant.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -1765,6 +1908,7 @@
                      "Indicates that power unit redundancy has been degraded.",
                      "Power Unit Redundancy degraded.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -1778,6 +1922,7 @@
 
             "Power Unit NonRedundant from insufficient to sufficient.",
             "Warning",
+            "Warning",
             0,
             {},
             "None.",
@@ -1788,6 +1933,7 @@
                      "power to support redundancy.",
                      "Power Unit NonRedundant and has insufficient resource.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1797,6 +1943,7 @@
                      "Indicates that power unit redundancy has been lost.",
                      "Power Unit Redundancy lost.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -1807,6 +1954,7 @@
             "Indicates that power unit full redundancy has been regained.",
             "Power Unit Redundancy regained.",
             "OK",
+            "OK",
             0,
             {},
             "None.",
@@ -1818,6 +1966,7 @@
             "has sufficient power to support redundancy.",
             "Power Unit Nonredundant but has sufficient resource.",
             "Warning",
+            "Warning",
             0,
             {},
             "None.",
@@ -1827,6 +1976,7 @@
                      "Indicates that the reset button was pressed.",
                      "Reset Button Pressed.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -1836,6 +1986,7 @@
                      "Indicates that the BMC 2nd boot flash is enabled.",
                      "BMC 2nd boot flash is enabled.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1845,6 +1996,7 @@
                      "Indicates that the P2A bridge is enabled.",
                      "P2A(PCIe to AHB) bridge is enabled.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1854,6 +2006,7 @@
                      "Indicates that the uart port debug is enabled.",
                      "Uart port debug is enabled.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1864,6 +2017,7 @@
             "Indicates that password computing hash algorithm changed.",
             "Password computing hash algorithm is changed to sha256/sha512.",
             "OK",
+            "OK",
             0,
             {},
             "None.",
@@ -1874,6 +2028,7 @@
                      "Indicates that non root user assigned with user ID zero.",
                      "User ID Zero is assigned with non-root user.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1883,6 +2038,7 @@
                      "Indicates that non root user ID is removed",
                      "Non root user assigned with user ID zero is removed.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -1893,6 +2049,7 @@
                      "Indicates that system root user is enabled.",
                      "User root is enabled.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1902,6 +2059,7 @@
                      "Indicates that system root user is disabled.",
                      "User root is disabled.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -1912,6 +2070,7 @@
                      "Indicates that unsupported shell is enabled.",
                      "Unsupported shell is enabled.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -1921,6 +2080,7 @@
                      "Indicates that unsupported shell is removed.",
                      "Unsupported shell is removed.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -1932,6 +2092,7 @@
             "Indicates that weak password computing hash algorithm is enabled.",
             "Weak password computing hash algorithm is enabled.",
             "Critical",
+            "Critical",
             0,
             {},
             "None.",
@@ -1942,6 +2103,7 @@
                      "Add SEL Entry or Platform Event command.",
                      "SEL Entry Added: %1",
                      "OK",
+                     "OK",
                      1,
 
                      {
@@ -1956,6 +2118,7 @@
                      "%1 sensor crossed a critical high threshold going "
                      "high. Reading=%2 Threshold=%3.",
                      "Critical",
+                     "Critical",
                      3,
                      {"string", "number", "number"},
                      "Check the sensor or subsystem for errors.",
@@ -1967,6 +2130,7 @@
                      "%1 sensor crossed a critical high threshold going low. "
                      "Reading=%2 Threshold=%3.",
                      "OK",
+                     "OK",
                      3,
                      {"string", "number", "number"},
                      "None.",
@@ -1978,6 +2142,7 @@
                      "%1 sensor crossed a critical low threshold going high. "
                      "Reading=%2 Threshold=%3.",
                      "OK",
+                     "OK",
                      3,
                      {"string", "number", "number"},
                      "None.",
@@ -1989,6 +2154,7 @@
                      "%1 sensor crossed a critical low threshold going low. "
                      "Reading=%2 Threshold=%3.",
                      "Critical",
+                     "Critical",
                      3,
                      {"string", "number", "number"},
                      "Check the sensor or subsystem for errors.",
@@ -2000,6 +2166,7 @@
                      "%1 sensor crossed a warning high threshold going high. "
                      "Reading=%2 Threshold=%3.",
                      "Warning",
+                     "Warning",
                      3,
                      {"string", "number", "number"},
                      "Check the sensor or subsystem for errors.",
@@ -2011,6 +2178,7 @@
                      "%1 sensor crossed a warning high threshold going low. "
                      "Reading=%2 Threshold=%3.",
                      "OK",
+                     "OK",
                      3,
                      {"string", "number", "number"},
                      "None.",
@@ -2022,6 +2190,7 @@
                      "%1 sensor crossed a warning low threshold going high. "
                      "Reading=%2 Threshold=%3.",
                      "OK",
+                     "OK",
                      3,
                      {"string", "number", "number"},
                      "None.",
@@ -2033,6 +2202,7 @@
                      "%1 sensor crossed a warning low threshold going low. "
                      "Reading=%2 Threshold=%3.",
                      "Warning",
+                     "Warning",
                      3,
                      {"string", "number", "number"},
                      "Check the sensor or subsystem for errors.",
@@ -2042,6 +2212,7 @@
                      "Indicates that a service has exited unsuccessfully.",
                      "Service %1 has exited unsuccessfully.",
                      "Warning",
+                     "Warning",
                      1,
                      {"string"},
                      "None.",
@@ -2052,6 +2223,7 @@
                      "Sparing redundancy state degraded. Socket=%1 "
                      "Channel=%2 DIMM=%3 Domain=%4 Rank=%5.",
                      "Warning",
+                     "Warning",
                      5,
 
                      {
@@ -2070,6 +2242,7 @@
             "Sparing redundancy state fully redundant. Socket=%1 "
             "Channel=%2 DIMM=%3 Domain=%4 Rank=%5.",
             "OK",
+            "OK",
             5,
 
             {
@@ -2086,6 +2259,7 @@
                      "Indicates that an SSB Thermal trip has been asserted.",
                      "SSB Thermal trip.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2098,6 +2272,7 @@
                      "The system interface is in the disabled provisioned "
                      "state.",
                      "OK",
+                     "OK",
                      0,
                      {},
                      "None.",
@@ -2109,6 +2284,7 @@
                      "execute through the system interface.",
                      "The system interface is in the unprovisioned state.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2121,6 +2297,7 @@
                      "The system interface is in the whitelist provisioned "
                      "state.",
                      "Warning",
+                     "Warning",
                      0,
                      {},
                      "None.",
@@ -2132,6 +2309,7 @@
                      "System power good failed to assert within %1 "
                      "milliseconds (VR failure).",
                      "Critical",
+                     "Critical",
                      1,
                      {"number"},
                      "None.",
@@ -2142,6 +2320,7 @@
                      "system was powered on.",
                      "System Power Lost.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2151,6 +2330,7 @@
                      "Indicates that the system failed to power off.",
                      "System Power-Off Failed.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2160,6 +2340,7 @@
                      "Indicates that the system failed to power on.",
                      "System Power-On Failed.",
                      "Critical",
+                     "Critical",
                      0,
                      {},
                      "None.",
@@ -2170,6 +2351,7 @@
             "Indicates that the specified voltage regulator overheated.",
             "%1 Voltage Regulator Overheated.",
             "Critical",
+            "Critical",
             1,
             {"string"},
             "None.",
diff --git a/redfish-core/include/registries/task_event_message_registry.hpp b/redfish-core/include/registries/task_event_message_registry.hpp
index a2e3a89..19501a1 100644
--- a/redfish-core/include/registries/task_event_message_registry.hpp
+++ b/redfish-core/include/registries/task_event_message_registry.hpp
@@ -23,25 +23,26 @@
 namespace redfish::message_registries::task_event
 {
 const Header header = {
-    "Copyright 2014-2018 DMTF in cooperation with the Storage Networking "
+    "Copyright 2014-2020 DMTF in cooperation with the Storage Networking "
     "Industry Association (SNIA). All rights reserved.",
-    "#MessageRegistry.v1_2_0.MessageRegistry",
-    "TaskEvent.1.0.1",
+    "#MessageRegistry.v1_4_0.MessageRegistry",
+    "TaskEvent.1.0.2",
     "Task Event Message Registry",
     "en",
     "This registry defines the messages for task related events.",
     "TaskEvent",
-    "1.0.1",
+    "1.0.2",
     "DMTF",
 };
 constexpr const char* url =
-    "https://redfish.dmtf.org/registries/TaskEvent.1.0.1.json";
+    "https://redfish.dmtf.org/registries/TaskEvent.1.0.2.json";
 
 constexpr std::array<MessageEntry, 9> registry = {
     MessageEntry{"TaskAborted",
                  {
-                     "The task with id %1 has been aborted.",
-                     "The task with id %1 has been aborted.",
+                     "A task has been aborted.",
+                     "The task with Id '%1' has been aborted.",
+                     "Critical",
                      "Critical",
                      1,
                      {
@@ -51,8 +52,9 @@
                  }},
     MessageEntry{"TaskCancelled",
                  {
-                     "The task with id %1 has been cancelled.",
-                     "The task with id %1 has been cancelled.",
+                     "A task has been cancelled.",
+                     "The task with Id '%1' has been cancelled.",
+                     "Warning",
                      "Warning",
                      1,
                      {
@@ -62,8 +64,9 @@
                  }},
     MessageEntry{"TaskCompletedOK",
                  {
-                     "The task with id %1 has completed.",
-                     "The task with id %1 has completed.",
+                     "A task has completed.",
+                     "The task with Id '%1' has completed.",
+                     "OK",
                      "OK",
                      1,
                      {
@@ -73,8 +76,9 @@
                  }},
     MessageEntry{"TaskCompletedWarning",
                  {
-                     "The task with id %1 has completed with warnings.",
-                     "The task with id %1 has completed with warnings.",
+                     "A task has completed with warnings.",
+                     "The task with Id '%1' has completed with warnings.",
+                     "Warning",
                      "Warning",
                      1,
                      {
@@ -84,8 +88,9 @@
                  }},
     MessageEntry{"TaskPaused",
                  {
-                     "The task with id %1 has been paused.",
-                     "The task with id %1 has been paused.",
+                     "A task has been paused.",
+                     "The task with Id '%1' has been paused.",
+                     "Warning",
                      "Warning",
                      1,
                      {
@@ -93,23 +98,25 @@
                      },
                      "None.",
                  }},
-    MessageEntry{
-        "TaskProgressChanged",
-        {
-            "The task with id %1 has changed to progress %2 percent complete.",
-            "The task with id %1 has changed to progress %2 percent complete.",
-            "OK",
-            2,
-            {
-                "string",
-                "number",
-            },
-            "None.",
-        }},
+    MessageEntry{"TaskProgressChanged",
+                 {
+                     "A task has changed progress.",
+                     "The task with Id '%1' has changed to progress %2 percent "
+                     "complete.",
+                     "OK",
+                     "OK",
+                     2,
+                     {
+                         "string",
+                         "number",
+                     },
+                     "None.",
+                 }},
     MessageEntry{"TaskRemoved",
                  {
-                     "The task with id %1 has been removed.",
-                     "The task with id %1 has been removed.",
+                     "A task has been removed.",
+                     "The task with Id '%1' has been removed.",
+                     "Warning",
                      "Warning",
                      1,
                      {
@@ -119,8 +126,9 @@
                  }},
     MessageEntry{"TaskResumed",
                  {
-                     "The task with id %1 has been resumed.",
-                     "The task with id %1 has been resumed.",
+                     "A task has been resumed.",
+                     "The task with Id '%1' has been resumed.",
+                     "OK",
                      "OK",
                      1,
                      {
@@ -130,8 +138,9 @@
                  }},
     MessageEntry{"TaskStarted",
                  {
-                     "The task with id %1 has started.",
-                     "The task with id %1 has started.",
+                     "A task has started.",
+                     "The task with Id '%1' has started.",
+                     "OK",
                      "OK",
                      1,
                      {
diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp
index 1878070..89538f3 100644
--- a/redfish-core/lib/message_registries.hpp
+++ b/redfish-core/lib/message_registries.hpp
@@ -242,6 +242,7 @@
             obj = {{"Description", message->second.description},
                    {"Message", message->second.message},
                    {"Severity", message->second.severity},
+                   {"MessageSeverity", message->second.messageSeverity},
                    {"NumberOfArgs", message->second.numberOfArgs},
                    {"Resolution", message->second.resolution}};
             if (message->second.numberOfArgs > 0)
diff --git a/scripts/parse_registries.py b/scripts/parse_registries.py
index 3680738..60563da 100755
--- a/scripts/parse_registries.py
+++ b/scripts/parse_registries.py
@@ -64,9 +64,9 @@
 
 
 files = []
-files.append(make_getter('Base.1.4.0.json',
+files.append(make_getter('Base.1.8.1.json',
                          'base_message_registry.hpp', 'base'))
-files.append(make_getter('TaskEvent.1.0.1.json',
+files.append(make_getter('TaskEvent.1.0.2.json',
                          'task_event_message_registry.hpp', 'task_event'))
 
 # Remove the old files
@@ -102,6 +102,7 @@
             registry.write("\"{}\",".format(message["Description"]))
             registry.write("\"{}\",".format(message["Message"]))
             registry.write("\"{}\",".format(message["Severity"]))
+            registry.write("\"{}\",".format(message["MessageSeverity"]))
             registry.write("{},".format(message["NumberOfArgs"]))
             registry.write("{")
             paramTypes = message.get("ParamTypes")