diff --git a/adaptercore/openolt_eventmgr.go b/adaptercore/openolt_eventmgr.go
index 835abe6..4205797 100644
--- a/adaptercore/openolt_eventmgr.go
+++ b/adaptercore/openolt_eventmgr.go
@@ -294,6 +294,7 @@
 	/* Populating event context */
 	context["intf-id"] = strconv.FormatUint(uint64(oaf.IntfId), base10)
 	context["onu-id"] = strconv.FormatUint(uint64(oaf.OnuId), base10)
+	context["fail-reason"] = strconv.FormatUint(uint64(oaf.FailReason), base10)
 	/* Populating device event body */
 	de.Context = context
 	de.ResourceId = deviceID
@@ -336,8 +337,8 @@
 	/* Populating event context */
 	context["intf-id"] = strconv.FormatUint(uint64(onuDriftWindow.IntfId), base10)
 	context["onu-id"] = strconv.FormatUint(uint64(onuDriftWindow.OnuId), base10)
-	context["drift"] = strconv.FormatUint(uint64(onuDriftWindow.OnuId), base10)
-	context["new-eqd"] = strconv.FormatUint(uint64(onuDriftWindow.OnuId), base10)
+	context["drift"] = strconv.FormatUint(uint64(onuDriftWindow.Drift), base10)
+	context["new-eqd"] = strconv.FormatUint(uint64(onuDriftWindow.NewEqd), base10)
 	/* Populating device event body */
 	de.Context = context
 	de.ResourceId = deviceID
@@ -361,6 +362,7 @@
 	/* Populating event context */
 	context["intf-id"] = strconv.FormatUint(uint64(onuSignalDegrade.IntfId), base10)
 	context["onu-id"] = strconv.FormatUint(uint64(onuSignalDegrade.OnuId), base10)
+	context["inverse-bit-error-rate"] = strconv.FormatUint(uint64(onuSignalDegrade.InverseBitErrorRate), base10)
 	/* Populating device event body */
 	de.Context = context
 	de.ResourceId = deviceID