diff --git a/redfish-core/include/registries/base_message_registry.hpp b/redfish-core/include/registries/base_message_registry.hpp
index 16c0011..dc5060b 100644
--- a/redfish-core/include/registries/base_message_registry.hpp
+++ b/redfish-core/include/registries/base_message_registry.hpp
@@ -18,18 +18,18 @@
 namespace redfish::registries::base
 {
 const Header header = {
-    "Copyright 2014-2022 DMTF. All rights reserved.",
+    "Copyright 2014-2023 DMTF. All rights reserved.",
     "#MessageRegistry.v1_5_0.MessageRegistry",
-    "Base.1.13.0",
+    "Base.1.16.0",
     "Base Message Registry",
     "en",
     "This registry defines the base messages for Redfish",
     "Base",
-    "1.13.0",
+    "1.16.0",
     "DMTF",
 };
 constexpr const char* url =
-    "https://redfish.dmtf.org/registries/Base.1.13.0.json";
+    "https://redfish.dmtf.org/registries/Base.1.16.0.json";
 
 constexpr std::array registry =
 {
@@ -230,6 +230,42 @@
             "Correct the value for the parameter in the request body and resubmit the request if the operation failed.",
         }},
     MessageEntry{
+        "ArraySizeTooLong",
+        {
+            "Indicates that the size of the array exceeded the maximum number of elements.",
+            "The array provided for property %1 exceeds the size limit %2.",
+            "Warning",
+            2,
+            {
+                "string",
+                "number",
+            },
+            "Resubmit the request with an appropriate array size.",
+        }},
+    MessageEntry{
+        "ArraySizeTooShort",
+        {
+            "Indicates that the size of the array is under the minimum number of elements.",
+            "The array provided for property %1 is under the minimum size limit %2.",
+            "Warning",
+            2,
+            {
+                "string",
+                "number",
+            },
+            "Resubmit the request with an appropriate array size.",
+        }},
+    MessageEntry{
+        "AuthenticationTokenRequired",
+        {
+            "Indicates that the request could not be performed because an authentication token was not provided.",
+            "The request could not be performed because an authentication token was not provided.",
+            "Critical",
+            0,
+            {},
+            "Obtain an authentication token and resubmit the request.",
+        }},
+    MessageEntry{
         "ChassisPowerStateOffRequired",
         {
             "Indicates that the request requires a specified chassis to be powered off.",
@@ -450,6 +486,18 @@
             "Provide a valid URI and resubmit the request.",
         }},
     MessageEntry{
+        "LicenseRequired",
+        {
+            "Indicates that a license is required to perform the requested operation.",
+            "A license is required for this operation: %1.",
+            "Critical",
+            1,
+            {
+                "string",
+            },
+            "Install the requested license and resubmit the request.",
+        }},
+    MessageEntry{
         "MalformedJSON",
         {
             "Indicates that the request body was malformed JSON.",
@@ -861,6 +909,18 @@
             "Reduce the value for the query parameter to a value that is within range, such as a start or count value that is within bounds of the number of resources in a collection or a page that is within the range of valid pages.",
         }},
     MessageEntry{
+        "QueryParameterUnsupported",
+        {
+            "Indicates that a query parameter is not supported.",
+            "Query parameter '%1' is not supported.",
+            "Warning",
+            1,
+            {
+                "string",
+            },
+            "Correct or remove the query parameter and resubmit the request.",
+        }},
+    MessageEntry{
         "QueryParameterValueError",
         {
             "Indicates that a query parameter was given an invalid value.",
@@ -1194,6 +1254,19 @@
             "Resubmit the request with an appropriate string length.",
         }},
     MessageEntry{
+        "StringValueTooShort",
+        {
+            "Indicates that a string value passed to the given resource was under its minimum required length.  An example is when a higher minimum length is imposed by an implementation than that allowed by the specification.",
+            "The string '%1' was under the minimum required length %2.",
+            "Warning",
+            2,
+            {
+                "string",
+                "number",
+            },
+            "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.",
@@ -1256,93 +1329,99 @@
     actionParameterValueFormatError = 13,
     actionParameterValueNotInList = 14,
     actionParameterValueTypeError = 15,
-    chassisPowerStateOffRequired = 16,
-    chassisPowerStateOnRequired = 17,
-    conditionInRelatedResource = 18,
-    couldNotEstablishConnection = 19,
-    createFailedMissingReqProperties = 20,
-    createLimitReachedForResource = 21,
-    created = 22,
-    emptyJSON = 23,
-    eventBufferExceeded = 24,
-    eventSubscriptionLimitExceeded = 25,
-    generalError = 26,
-    headerInvalid = 27,
-    headerMissing = 28,
-    insufficientPrivilege = 29,
-    insufficientStorage = 30,
-    internalError = 31,
-    invalidIndex = 32,
-    invalidJSON = 33,
-    invalidObject = 34,
-    invalidURI = 35,
-    malformedJSON = 36,
-    maximumErrorsExceeded = 37,
-    missingOrMalformedPart = 38,
-    networkNameResolutionNotConfigured = 39,
-    networkNameResolutionNotSupported = 40,
-    noOperation = 41,
-    noValidSession = 42,
-    operationFailed = 43,
-    operationNotAllowed = 44,
-    operationTimeout = 45,
-    passwordChangeRequired = 46,
-    payloadTooLarge = 47,
-    preconditionFailed = 48,
-    preconditionRequired = 49,
-    propertyDeprecated = 50,
-    propertyDuplicate = 51,
-    propertyMissing = 52,
-    propertyNotUpdated = 53,
-    propertyNotWritable = 54,
-    propertyUnknown = 55,
-    propertyValueConflict = 56,
-    propertyValueDeprecated = 57,
-    propertyValueError = 58,
-    propertyValueExternalConflict = 59,
-    propertyValueFormatError = 60,
-    propertyValueIncorrect = 61,
-    propertyValueModified = 62,
-    propertyValueNotInList = 63,
-    propertyValueOutOfRange = 64,
-    propertyValueResourceConflict = 65,
-    propertyValueTypeError = 66,
-    queryCombinationInvalid = 67,
-    queryNotSupported = 68,
-    queryNotSupportedOnOperation = 69,
-    queryNotSupportedOnResource = 70,
-    queryParameterOutOfRange = 71,
-    queryParameterValueError = 72,
-    queryParameterValueFormatError = 73,
-    queryParameterValueTypeError = 74,
-    resetRecommended = 75,
-    resetRequired = 76,
-    resourceAlreadyExists = 77,
-    resourceAtUriInUnknownFormat = 78,
-    resourceAtUriUnauthorized = 79,
-    resourceCannotBeDeleted = 80,
-    resourceCreationConflict = 81,
-    resourceDeprecated = 82,
-    resourceExhaustion = 83,
-    resourceInStandby = 84,
-    resourceInUse = 85,
-    resourceMissingAtURI = 86,
-    resourceNotFound = 87,
-    resourceTypeIncompatible = 88,
-    restrictedPrivilege = 89,
-    restrictedRole = 90,
-    serviceDisabled = 91,
-    serviceInUnknownState = 92,
-    serviceShuttingDown = 93,
-    serviceTemporarilyUnavailable = 94,
-    sessionLimitExceeded = 95,
-    sessionTerminated = 96,
-    sourceDoesNotSupportProtocol = 97,
-    strictAccountTypes = 98,
-    stringValueTooLong = 99,
-    subscriptionTerminated = 100,
-    success = 101,
-    undeterminedFault = 102,
-    unrecognizedRequestBody = 103,
+    arraySizeTooLong = 16,
+    arraySizeTooShort = 17,
+    authenticationTokenRequired = 18,
+    chassisPowerStateOffRequired = 19,
+    chassisPowerStateOnRequired = 20,
+    conditionInRelatedResource = 21,
+    couldNotEstablishConnection = 22,
+    createFailedMissingReqProperties = 23,
+    createLimitReachedForResource = 24,
+    created = 25,
+    emptyJSON = 26,
+    eventBufferExceeded = 27,
+    eventSubscriptionLimitExceeded = 28,
+    generalError = 29,
+    headerInvalid = 30,
+    headerMissing = 31,
+    insufficientPrivilege = 32,
+    insufficientStorage = 33,
+    internalError = 34,
+    invalidIndex = 35,
+    invalidJSON = 36,
+    invalidObject = 37,
+    invalidURI = 38,
+    licenseRequired = 39,
+    malformedJSON = 40,
+    maximumErrorsExceeded = 41,
+    missingOrMalformedPart = 42,
+    networkNameResolutionNotConfigured = 43,
+    networkNameResolutionNotSupported = 44,
+    noOperation = 45,
+    noValidSession = 46,
+    operationFailed = 47,
+    operationNotAllowed = 48,
+    operationTimeout = 49,
+    passwordChangeRequired = 50,
+    payloadTooLarge = 51,
+    preconditionFailed = 52,
+    preconditionRequired = 53,
+    propertyDeprecated = 54,
+    propertyDuplicate = 55,
+    propertyMissing = 56,
+    propertyNotUpdated = 57,
+    propertyNotWritable = 58,
+    propertyUnknown = 59,
+    propertyValueConflict = 60,
+    propertyValueDeprecated = 61,
+    propertyValueError = 62,
+    propertyValueExternalConflict = 63,
+    propertyValueFormatError = 64,
+    propertyValueIncorrect = 65,
+    propertyValueModified = 66,
+    propertyValueNotInList = 67,
+    propertyValueOutOfRange = 68,
+    propertyValueResourceConflict = 69,
+    propertyValueTypeError = 70,
+    queryCombinationInvalid = 71,
+    queryNotSupported = 72,
+    queryNotSupportedOnOperation = 73,
+    queryNotSupportedOnResource = 74,
+    queryParameterOutOfRange = 75,
+    queryParameterUnsupported = 76,
+    queryParameterValueError = 77,
+    queryParameterValueFormatError = 78,
+    queryParameterValueTypeError = 79,
+    resetRecommended = 80,
+    resetRequired = 81,
+    resourceAlreadyExists = 82,
+    resourceAtUriInUnknownFormat = 83,
+    resourceAtUriUnauthorized = 84,
+    resourceCannotBeDeleted = 85,
+    resourceCreationConflict = 86,
+    resourceDeprecated = 87,
+    resourceExhaustion = 88,
+    resourceInStandby = 89,
+    resourceInUse = 90,
+    resourceMissingAtURI = 91,
+    resourceNotFound = 92,
+    resourceTypeIncompatible = 93,
+    restrictedPrivilege = 94,
+    restrictedRole = 95,
+    serviceDisabled = 96,
+    serviceInUnknownState = 97,
+    serviceShuttingDown = 98,
+    serviceTemporarilyUnavailable = 99,
+    sessionLimitExceeded = 100,
+    sessionTerminated = 101,
+    sourceDoesNotSupportProtocol = 102,
+    strictAccountTypes = 103,
+    stringValueTooLong = 104,
+    stringValueTooShort = 105,
+    subscriptionTerminated = 106,
+    success = 107,
+    undeterminedFault = 108,
+    unrecognizedRequestBody = 109,
 };
 } // namespace redfish::registries::base
diff --git a/redfish-core/include/registries/resource_event_message_registry.hpp b/redfish-core/include/registries/resource_event_message_registry.hpp
index 83ca786..126c277 100644
--- a/redfish-core/include/registries/resource_event_message_registry.hpp
+++ b/redfish-core/include/registries/resource_event_message_registry.hpp
@@ -18,22 +18,35 @@
 namespace redfish::registries::resource_event
 {
 const Header header = {
-    "Copyright 2014-2020 DMTF in cooperation with the Storage Networking Industry Association (SNIA). All rights reserved.",
-    "#MessageRegistry.v1_4_0.MessageRegistry",
-    "ResourceEvent.1.0.3",
+    "Copyright 2014-2023 DMTF in cooperation with the Storage Networking Industry Association (SNIA). All rights reserved.",
+    "#MessageRegistry.v1_6_0.MessageRegistry",
+    "ResourceEvent.1.3.0",
     "Resource Event Message Registry",
     "en",
     "This registry defines the messages to use for resource events.",
     "ResourceEvent",
-    "1.0.3",
+    "1.3.0",
     "DMTF",
 };
 constexpr const char* url =
-    "https://redfish.dmtf.org/registries/ResourceEvent.1.0.3.json";
+    "https://redfish.dmtf.org/registries/ResourceEvent.1.3.0.json";
 
 constexpr std::array registry =
 {
     MessageEntry{
+        "AggregationSourceDiscovered",
+        {
+            "Indicates that a new aggregation source has been discovered.",
+            "A aggregation source of connection method `%1` located at `%2` has been discovered.",
+            "OK",
+            2,
+            {
+                "string",
+                "string",
+            },
+            "The aggregation source is available to the service and can be identified using the identified connection method.",
+        }},
+    MessageEntry{
         "LicenseAdded",
         {
             "Indicates that a license has been added.",
@@ -145,6 +158,66 @@
             "Resolution dependent upon error type.",
         }},
     MessageEntry{
+        "ResourcePaused",
+        {
+            "Indicates that the power state of a resource has changed to paused.",
+            "The resource `%1` has been paused.",
+            "OK",
+            1,
+            {
+                "string",
+            },
+            "None.",
+        }},
+    MessageEntry{
+        "ResourcePoweredOff",
+        {
+            "Indicates that the power state of a resource has changed to powered off.",
+            "The resource `%1` has powered off.",
+            "OK",
+            1,
+            {
+                "string",
+            },
+            "None.",
+        }},
+    MessageEntry{
+        "ResourcePoweredOn",
+        {
+            "Indicates that the power state of a resource has changed to powered on.",
+            "The resource `%1` has powered on.",
+            "OK",
+            1,
+            {
+                "string",
+            },
+            "None.",
+        }},
+    MessageEntry{
+        "ResourcePoweringOff",
+        {
+            "Indicates that the power state of a resource has changed to powering off.",
+            "The resource `%1` is powering off.",
+            "OK",
+            1,
+            {
+                "string",
+            },
+            "None.",
+        }},
+    MessageEntry{
+        "ResourcePoweringOn",
+        {
+            "Indicates that the power state of a resource has changed to powering on.",
+            "The resource `%1` is powering on.",
+            "OK",
+            1,
+            {
+                "string",
+            },
+            "None.",
+        }},
+    MessageEntry{
         "ResourceRemoved",
         {
             "Indicates that all conditions of a successful remove operation have been met.",
@@ -177,6 +250,19 @@
             "See vendor specific instructions for specific actions.",
         }},
     MessageEntry{
+        "ResourceStateChanged",
+        {
+            "Indicates that the state of a resource has changed.",
+            "The state of resource `%1` has changed to %2.",
+            "OK",
+            2,
+            {
+                "string",
+                "string",
+            },
+            "None.",
+        }},
+    MessageEntry{
         "ResourceStatusChangedCritical",
         {
             "Indicates that the health of a resource has changed to Critical.",
@@ -254,6 +340,16 @@
             "None.",
         }},
     MessageEntry{
+        "TestMessage",
+        {
+            "A test message used to validate event delivery mechanisms.",
+            "Test message.",
+            "OK",
+            0,
+            {},
+            "None.",
+        }},
+    MessageEntry{
         "URIForResourceChanged",
         {
             "Indicates that the URI for a resource has changed.  Examples for this would be physical component replacement or redistribution.",
@@ -268,24 +364,32 @@
 
 enum class Index
 {
-    licenseAdded = 0,
-    licenseChanged = 1,
-    licenseExpired = 2,
-    resourceChanged = 3,
-    resourceCreated = 4,
-    resourceErrorThresholdCleared = 5,
-    resourceErrorThresholdExceeded = 6,
-    resourceErrorsCorrected = 7,
-    resourceErrorsDetected = 8,
-    resourceRemoved = 9,
-    resourceSelfTestCompleted = 10,
-    resourceSelfTestFailed = 11,
-    resourceStatusChangedCritical = 12,
-    resourceStatusChangedOK = 13,
-    resourceStatusChangedWarning = 14,
-    resourceVersionIncompatible = 15,
-    resourceWarningThresholdCleared = 16,
-    resourceWarningThresholdExceeded = 17,
-    uRIForResourceChanged = 18,
+    aggregationSourceDiscovered = 0,
+    licenseAdded = 1,
+    licenseChanged = 2,
+    licenseExpired = 3,
+    resourceChanged = 4,
+    resourceCreated = 5,
+    resourceErrorThresholdCleared = 6,
+    resourceErrorThresholdExceeded = 7,
+    resourceErrorsCorrected = 8,
+    resourceErrorsDetected = 9,
+    resourcePaused = 10,
+    resourcePoweredOff = 11,
+    resourcePoweredOn = 12,
+    resourcePoweringOff = 13,
+    resourcePoweringOn = 14,
+    resourceRemoved = 15,
+    resourceSelfTestCompleted = 16,
+    resourceSelfTestFailed = 17,
+    resourceStateChanged = 18,
+    resourceStatusChangedCritical = 19,
+    resourceStatusChangedOK = 20,
+    resourceStatusChangedWarning = 21,
+    resourceVersionIncompatible = 22,
+    resourceWarningThresholdCleared = 23,
+    resourceWarningThresholdExceeded = 24,
+    testMessage = 25,
+    uRIForResourceChanged = 26,
 };
 } // namespace redfish::registries::resource_event
diff --git a/scripts/parse_registries.py b/scripts/parse_registries.py
index 369bebf..3f1fd27 100755
--- a/scripts/parse_registries.py
+++ b/scripts/parse_registries.py
@@ -232,7 +232,7 @@
     if "base" in registries:
         files.append(
             make_getter(
-                "Base.1.13.0.json", "base_message_registry.hpp", "base"
+                "Base.1.16.0.json", "base_message_registry.hpp", "base"
             )
         )
     if "task_event" in registries:
@@ -246,7 +246,7 @@
     if "resource_event" in registries:
         files.append(
             make_getter(
-                "ResourceEvent.1.0.3.json",
+                "ResourceEvent.1.3.0.json",
                 "resource_event_message_registry.hpp",
                 "resource_event",
             )