diff --git a/Sources/TwilioEngage/TwilioEngage.swift b/Sources/TwilioEngage/TwilioEngage.swift
index ee2c140..5daa0c1 100644
--- a/Sources/TwilioEngage/TwilioEngage.swift
+++ b/Sources/TwilioEngage/TwilioEngage.swift
@@ -120,10 +120,10 @@ public class TwilioEngage: EventPlugin {
         if event.event == Events.opened.rawValue {
             if var properties = event.properties?.dictionaryValue {
                 let formattedEventName = event.event.lowercased().replacingOccurrences(of: " ", with: "_")
-                let messageId = properties["message_id"] ?? UUID().toString()
-                let deDup_id = "\(formattedEventName)\(messageId)"
+                let messageId: String = properties["message_id"] as? String ?? UUID().toString()
+                let deDup_id = "\(messageId)\(formattedEventName)"
                 properties[keyPath: "dedup_id"] = deDup_id
-                
+                properties[keyPath: "event_id"] = messageId
                 event.properties = try? JSON(properties)
             }
         }
diff --git a/Sources/TwilioEngage/Version.swift b/Sources/TwilioEngage/Version.swift
index c4c8406..518115a 100644
--- a/Sources/TwilioEngage/Version.swift
+++ b/Sources/TwilioEngage/Version.swift
@@ -13,4 +13,4 @@
 // Use release.sh's automation.
 
 // BREAKING.FEATURE.FIX
-internal let __twilioengage_version = "0.9.9"
+internal let __twilioengage_version = "1.0.0"