diff --git a/src/main/resources/org/opensearch/ubl/backends/events-mapping.json b/src/main/resources/org/opensearch/ubl/backends/events-mapping.json
index 423f208..cae5d7a 100644
--- a/src/main/resources/org/opensearch/ubl/backends/events-mapping.json
+++ b/src/main/resources/org/opensearch/ubl/backends/events-mapping.json
@@ -1,69 +1,38 @@
 {
-  "dynamic": false,
   "properties": {
-    "action_name": { "type" : "keyword" },
-    "user_id":     { "type" : "keyword" },
-    "session_id":  { "type" : "keyword" },
-    "time":  { "type" : "text" },
-    "data": {
+    "action_name": { "type": "keyword" },
+    "user_id": { "type": "keyword" },
+    "session_id": { "type": "keyword" },
+    "query_id": { "type": "keyword" },
+    "page_id": { "type": "keyword" },
+    "message": {
+      "type": "text",
+      "fields": {
+        "keyword": {
+          "type": "keyword",
+          "ignore_above": 256
+        }
+      }
+    },
+    "message_type": { "type": "keyword" },
+    "timestamp": {
+      "type": "date",
+      "format": "yyyy-MM-dd HH:mm:ss.SSSSSS||date_time",
+      "doc_values": true
+    },
+    "event_attributes": {
       "properties": {
-        "info": {
-          "type": "text",
-          "fields": {
-            "keyword": {
-              "type": "keyword",
-              "ignore_above": 256
-            }
-          }
-        },
-        "warn": {
-          "type": "text",
-          "fields": {
-            "keyword": {
-              "type": "keyword",
-              "ignore_above": 256
-            }
-          }
-        },
-        "error": {
-          "type": "text",
-          "fields": {
-            "keyword": {
-              "type": "keyword",
-              "ignore_above": 256
-            }
-          }
+        "user_name": { "type": "keyword" },
+        "user_id": { "type": "keyword" },
+        "city": { "type": "keyword" },
+        "state": { "type": "keyword" },
+        "zip": { "type": "keyword" },
+        "email": { "type": "keyword" },
+        "price": { "type": "float" },
+        "ip": {
+          "type": "ip",
+          "ignore_malformed": true
         },
-        "debug": {
-          "type": "text",
-          "fields": {
-            "keyword": {
-              "type": "keyword",
-              "ignore_above": 256
-            }
-          }
-        },
-        "data":  { "type" : "object" },
-        "user_name":  {"type": "keyword"},
-        "user_id":  {"type": "keyword"},
-        "to_user_id":  {"type": "keyword"},
-        "transaction_id":  {"type": "keyword"},
-        "transaction_type":  {"type": "keyword"},
-        "query_session":  {"type": "keyword"},
-        "searched_for": {
-          "type": "text",
-          "fields": {
-            "keyword": {
-              "type": "keyword",
-              "ignore_above": 256
-            }
-          }
-        },
-        "product_id":  {"type": "keyword"},
-        "product_type":  { "type": "text"},
-        "product_description": { "type": "text"},
-        "content":  { "type": "text"},
-        "price":  { "type": "float"},
         "browser": {
           "type": "text",
           "fields": {
@@ -73,23 +42,17 @@
             }
           }
         },
-        "ip": {"type":"ip","ignore_malformed": true},
-        "datetime": {"type": "date", "doc_values": true},
-        "dob": {"type": "date", "doc_values": true},
-        "address": {
-          "type": "text",
-          "fields": {
-            "keyword": {
-              "type": "keyword",
-              "ignore_above": 256
-            }
+        "data": {
+          "properties": {
+            "data_id": { "type": "keyword" },
+            "data_type": { "type": "text" },
+            "transaction_id": { "type": "keyword" },
+            "description": { "type": "text" },
+            "to_user_id": { "type": "keyword" },
+            "data_detail": { "type": "object" }
           }
-        },
-        "city":  {"type": "keyword"},
-        "state":  {"type": "keyword"},
-        "zip":  {"type": "keyword"},
-        "email":  {"type": "keyword"}
+        }
       }
     }
   }
-}
+}
\ No newline at end of file