diff --git a/thalerj/policyTable.json b/thalerj/policyTable.json
index 38e1f15..d6e7010 100644
--- a/thalerj/policyTable.json
+++ b/thalerj/policyTable.json
@@ -33,7 +33,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Connection Error. View additional details for more information",
             "ReferencedInventory": "Network Error",
             "RelatedEventIDs": {},
@@ -54,7 +54,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failure to write to host CFAM interface",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -75,7 +75,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failure to read from host CFAM interface",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -5767,7 +5767,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "The motherboard has recovered from an error",
+            "Message": "The system backplane has recovered from an error",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -5829,7 +5829,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A vital system component has been disabled",
             "ReferencedInventory": 1,
             "RelatedEventIDs": {},
@@ -5850,7 +5850,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An unknown problem occurred",
             "ReferencedInventory": 10,
             "RelatedEventIDs": {},
@@ -5892,7 +5892,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A system firmware error occurred.",
             "ReferencedInventory": 16,
             "RelatedEventIDs": {},
@@ -5913,7 +5913,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A system firmware error occurred.",
             "ReferencedInventory": "1C",
             "RelatedEventIDs": {},
@@ -5934,7 +5934,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A memory configuration error has been detected.",
             "ReferencedInventory": 22,
             "RelatedEventIDs": {},
@@ -5955,7 +5955,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A FSI path error has occurred.",
             "ReferencedInventory": "2D",
             "RelatedEventIDs": {},
@@ -5976,7 +5976,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An external processor interface problem has occurred",
             "ReferencedInventory": 30,
             "RelatedEventIDs": {},
@@ -5997,7 +5997,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An internal processor interface problem has occurred",
             "ReferencedInventory": 31,
             "RelatedEventIDs": {},
@@ -6018,7 +6018,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A memory bus error occurred.",
             "ReferencedInventory": 34,
             "RelatedEventIDs": {},
@@ -6039,7 +6039,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A bus error occurred.",
             "ReferencedInventory": 37,
             "RelatedEventIDs": {},
@@ -6060,7 +6060,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A system power problem has occurred",
             "ReferencedInventory": "3F",
             "RelatedEventIDs": {},
@@ -6081,7 +6081,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A system firmware error occurred.",
             "ReferencedInventory": 4,
             "RelatedEventIDs": {},
@@ -6102,7 +6102,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "System performance is degraded",
             "ReferencedInventory": "4D",
             "RelatedEventIDs": {},
@@ -6123,7 +6123,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An uncorrectable memory problem occurred.",
             "ReferencedInventory": "4F",
             "RelatedEventIDs": {},
@@ -6144,7 +6144,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A system firmware error occurred.",
             "ReferencedInventory": 5,
             "RelatedEventIDs": {},
@@ -6165,7 +6165,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "The service processor detected a problem during the early boot process",
             "ReferencedInventory": 55,
             "RelatedEventIDs": {},
@@ -6186,7 +6186,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A problem with the time of day clock and or clock function has been detected.",
             "ReferencedInventory": 56,
             "RelatedEventIDs": {},
@@ -6207,7 +6207,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "One or more processor sensors detected an over temperature condition.",
             "ReferencedInventory": "5C",
             "RelatedEventIDs": {},
@@ -6228,7 +6228,7 @@
             "EventType": "Firmware/Software Not Valid",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Unable to verify the system firmware",
             "ReferencedInventory": "5D",
             "RelatedEventIDs": {},
@@ -6249,7 +6249,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An error occurred with a GPU and automated isolation was not possible",
             "ReferencedInventory": "5E",
             "RelatedEventIDs": {},
@@ -6270,7 +6270,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A CPU problem was detected.",
             "ReferencedInventory": 8,
             "RelatedEventIDs": {},
@@ -6291,7 +6291,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An error occurred with a memory DIMM and automated isolation was not possible",
             "ReferencedInventory": 9,
             "RelatedEventIDs": {},
@@ -6312,7 +6312,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "A system firmware error occurred.",
             "ReferencedInventory": "A",
             "RelatedEventIDs": {},
@@ -7761,7 +7761,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failure to configure OCC",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -7782,7 +7782,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failed to open OCC connection",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -7803,7 +7803,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failed to read from OCC",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -7824,7 +7824,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failed to write to OCC",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -7837,20 +7837,20 @@
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
             "BMCMessageID": "org.open_power.OCC.Metrics.Error.Event",
-            "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPCR0049M",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0064I",
             "ComponentInstance": null,
             "DateAdded": null,
             "DateReviewed": null,
-            "EventType": "Communication Failure/Timeout",
+            "EventType": "Status",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Error working with OCC metric data",
+            "LogSource": "BMC",
+            "Message": "OCC metric data collected",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
-            "Serviceable": true,
-            "Severity": "Critical",
+            "Serviceable": false,
+            "Severity": "Information",
             "UserAction": null,
             "VMMigrationFlag": null
         },
@@ -7859,7 +7859,7 @@
             "AffectedSubsystem": "Processing",
             "BMCMessageID": "org.open_power.Proc.FSI.Error.MasterDetectionFailure",
             "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0093M",
+            "CommonEventID": "FQPSPPU0097M",
             "ComponentInstance": null,
             "DateAdded": null,
             "DateReviewed": null,
@@ -7880,7 +7880,7 @@
             "AffectedSubsystem": "Processing",
             "BMCMessageID": "org.open_power.Proc.FSI.Error.SlaveDetectionFailure",
             "CallHomeCandidate": true,
-            "CommonEventID": "FQPSPPU0094M",
+            "CommonEventID": "FQPSPPU0098M",
             "ComponentInstance": null,
             "DateAdded": null,
             "DateReviewed": null,
@@ -8280,7 +8280,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 0,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -8292,7 +8292,7 @@
             "RelatedEventIDs": {},
             "Serviceable": true,
             "Severity": "Critical",
-            "UserAction": "Power",
+            "UserAction": null,
             "VMMigrationFlag": null
         },
         "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card1": {
@@ -8301,7 +8301,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 1,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -8313,7 +8313,7 @@
             "RelatedEventIDs": {},
             "Serviceable": true,
             "Severity": "Critical",
-            "UserAction": "Power",
+            "UserAction": null,
             "VMMigrationFlag": null
         },
         "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card2": {
@@ -8322,7 +8322,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 2,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -8334,7 +8334,7 @@
             "RelatedEventIDs": {},
             "Serviceable": true,
             "Severity": "Critical",
-            "UserAction": "Power",
+            "UserAction": null,
             "VMMigrationFlag": null
         },
         "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card3": {
@@ -8343,7 +8343,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 3,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -8355,7 +8355,7 @@
             "RelatedEventIDs": {},
             "Serviceable": true,
             "Severity": "Critical",
-            "UserAction": "Power",
+            "UserAction": null,
             "VMMigrationFlag": null
         },
         "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card4": {
@@ -8364,7 +8364,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 4,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -8376,7 +8376,7 @@
             "RelatedEventIDs": {},
             "Serviceable": true,
             "Severity": "Critical",
-            "UserAction": "Power",
+            "UserAction": null,
             "VMMigrationFlag": null
         },
         "org.open_power.Witherspoon.Fault.Error.GPUPowerFault||/xyz/openbmc_project/inventory/system/chassis/motherboard/gv100card5": {
@@ -8385,7 +8385,7 @@
             "BMCMessageID": "org.open_power.Witherspoon.Fault.Error.GPUPowerFault",
             "CallHomeCandidate": false,
             "CommonEventID": "FQPSPPW0038M",
-            "ComponentInstance": null,
+            "ComponentInstance": 5,
             "DateAdded": null,
             "DateReviewed": null,
             "EventType": "Environmental",
@@ -8397,7 +8397,7 @@
             "RelatedEventIDs": {},
             "Serviceable": true,
             "Severity": "Critical",
-            "UserAction": "Power",
+            "UserAction": null,
             "VMMigrationFlag": null
         },
         "org.open_power.Witherspoon.Fault.Error.PowerOnFailure": {
@@ -9861,7 +9861,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An error occurred on the FSI interface",
             "ReferencedInventory": "FSI",
             "RelatedEventIDs": {},
@@ -9882,7 +9882,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An error occurred on the I2C interface",
             "ReferencedInventory": "I2C",
             "RelatedEventIDs": {},
@@ -9903,7 +9903,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An error occurred on the GPIO interface",
             "ReferencedInventory": "GPIO",
             "RelatedEventIDs": {},
@@ -9924,7 +9924,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An error occurred on the I2C interface",
             "ReferencedInventory": "I2C",
             "RelatedEventIDs": {},
@@ -9945,7 +9945,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An error occurred working with an IPMI sensor",
             "ReferencedInventory": "IPMI",
             "RelatedEventIDs": {},
@@ -9967,7 +9967,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from the power sequencer chip on the motherboard",
+            "Message": "Failed to read from the power sequencer chip on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -10071,7 +10071,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failed to read from FSI Device",
             "ReferencedInventory": "FSI",
             "RelatedEventIDs": {},
@@ -10155,7 +10155,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failed to write to FSI Device",
             "ReferencedInventory": "FSI",
             "RelatedEventIDs": {},
@@ -10176,7 +10176,7 @@
             "EventType": "Communication Failure/Timeout",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Failed to write to I2C Device",
             "ReferencedInventory": "I2C",
             "RelatedEventIDs": {},
@@ -10248,6 +10248,27 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Common.Error.NotAllowed": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Common.Error.NotAllowed",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0074G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The specified operation is not allowed",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Common.Error.Timeout": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
@@ -10281,7 +10302,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Unable to open a file in BMC filesystem.",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -10302,8 +10323,8 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
-            "Message": "Unable to seek a file in BMC filesystem.",
+            "LogSource": "BMC",
+            "Message": "Unable to find a file in BMC filesystem.",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -10323,7 +10344,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Unable to write a file in BMC filesystem.",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -10680,7 +10701,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "An invalid host system control command was provided.",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -15363,7 +15384,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Internal method error with LED Mapper.",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -15384,7 +15405,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "Internal error. LED Mapper object not found.",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -16905,6 +16926,48 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.SBE.SEEPROM.Error.ValidationFail": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Security",
+            "BMCMessageID": "xyz.openbmc_project.SBE.SEEPROM.Error.ValidationFail",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPSE0065M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Security",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Firmware security validation failed",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.SBE.SEEPROM.Error.ValidationPass": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Security",
+            "BMCMessageID": "xyz.openbmc_project.SBE.SEEPROM.Error.ValidationPass",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPSE0066I",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Security",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Firmware security validation passed",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": false,
+            "Severity": "Information",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Sensor.Device.Error.ReadFailure||/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@1e78a000/1e78a100.i2c-bus/i2c-3/3-0052": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
@@ -16918,7 +16981,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from the fan control device on the motherboard",
+            "Message": "Failed to read from the fan control device on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -16981,7 +17044,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from the ambient temperature sensor on the motherboard",
+            "Message": "Failed to read from the ambient temperature sensor on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -17002,7 +17065,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from the ambient temperature sensor on the motherboard",
+            "Message": "Failed to read from the ambient temperature sensor on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -17023,7 +17086,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 0 VDD/VCS VRM on the motherboard",
+            "Message": "Failed to read from the CPU 0 VDD/VCS VRM on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -17044,7 +17107,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 1 VDN/VDDR VRM on the motherboard",
+            "Message": "Failed to read from the CPU 1 VDN/VDDR VRM on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -17065,7 +17128,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from the CPU 1 VDD/VCS VRM on the motherboard",
+            "Message": "Failed to read from the CPU 1 VDD/VCS VRM on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -17086,7 +17149,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to read from the PCIE temperature sensor on the motherboard",
+            "Message": "Failed to read from the PCIE temperature sensor on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -19165,7 +19228,7 @@
             "Internal": false,
             "LengthyDescription": null,
             "LogSource": "BMC",
-            "Message": "Failed to write to the fan control device on the motherboard",
+            "Message": "Failed to write to the fan control device on the system backplane",
             "ReferencedInventory": "/xyz/openbmc_project/inventory/system/chassis/motherboard",
             "RelatedEventIDs": {},
             "Serviceable": false,
@@ -21630,6 +21693,90 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.Software.Image.Error.InternalFailure": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Software.Image.Error.InternalFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0027G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Unable to process the image provided",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Software.Image.Error.ManifestFileFailure": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Software.Image.Error.ManifestFileFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0025G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Unable to read the manifest file",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Software.Image.Error.UnTarFailure": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Software.Image.Error.UnTarFailure",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0026G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Unable to decompress the tar file",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.Software.Version.Error.Incompatible": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.Software.Version.Error.Incompatible",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0067M",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Not Valid",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The PNOR and BMC code levels are not compatible and the system will not boot",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Critical",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.openbmc_project.Software.Version.Error.InternalFailure": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
@@ -21705,7 +21852,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "The soft power off of the host has timed out",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -21747,7 +21894,7 @@
             "EventType": "Unrecoverable Hardware Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "The system shut down due to not having enough functional fans.",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -21768,7 +21915,7 @@
             "EventType": "Environmental",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "The system was shut down due to a power fault being detected.",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -21789,7 +21936,7 @@
             "EventType": "Environmental",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "The system was shut down due to a GPU going over temperature",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -21810,7 +21957,7 @@
             "EventType": "Environmental",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "The system was shut down due to a processor going over temperature",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -21819,6 +21966,132 @@
             "UserAction": null,
             "VMMigrationFlag": null
         },
+        "xyz.openbmc_project.User.Common.Error.NoResource": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.User.Common.Error.NoResource",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0073G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "Insufficient resources to modify users",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.User.Common.Error.PrivilegeMappingExists": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.User.Common.Error.PrivilegeMappingExists",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0068G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The specified user privileges already exist",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.User.Common.Error.UserNameDoesNotExist": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.User.Common.Error.UserNameDoesNotExist",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0070G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The specified user name does not exist",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.User.Common.Error.UserNameExists": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.User.Common.Error.UserNameExists",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0069G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The specified user name already exists",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.User.Common.Error.UserNameGroupFail": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.User.Common.Error.UserNameGroupFail",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0071G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The specified user name cannot be assigned to the specified group",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
+        "xyz.openbmc_project.User.Common.Error.UserNamePrivFail": {
+            "AffectedLEDs": null,
+            "AffectedSubsystem": "Systems Management - Core / Virtual Appliance",
+            "BMCMessageID": "xyz.openbmc_project.User.Common.Error.UserNamePrivFail",
+            "CallHomeCandidate": false,
+            "CommonEventID": "FQPSPCR0072G",
+            "ComponentInstance": null,
+            "DateAdded": null,
+            "DateReviewed": null,
+            "EventType": "Firmware/Software Failure",
+            "Internal": false,
+            "LengthyDescription": null,
+            "LogSource": "BMC",
+            "Message": "The specified user does not have sufficient privileges",
+            "ReferencedInventory": null,
+            "RelatedEventIDs": {},
+            "Serviceable": true,
+            "Severity": "Warning",
+            "UserAction": null,
+            "VMMigrationFlag": null
+        },
         "xyz.opnbmc_project.State.Host.Error.SoftOffTimeout": {
             "AffectedLEDs": null,
             "AffectedSubsystem": "Canister/Appliance",
@@ -21831,7 +22104,7 @@
             "EventType": "Firmware/Software Failure",
             "Internal": false,
             "LengthyDescription": null,
-            "LogSource": null,
+            "LogSource": "BMC",
             "Message": "The host did not shutdown within the configured time",
             "ReferencedInventory": null,
             "RelatedEventIDs": {},
@@ -21843,7 +22116,7 @@
     },
     "fileInfo": {
         "Entity": "IBM OpenBMC",
-        "Version": "1.7.3",
+        "Version": 1.8,
         "language": "English"
     }
-}
\ No newline at end of file
+}