diff --git a/src/main/resources/events-mapping.json b/src/main/resources/events-mapping.json
index 705cfd2..da9cbbd 100644
--- a/src/main/resources/events-mapping.json
+++ b/src/main/resources/events-mapping.json
@@ -1,114 +1,45 @@
 {
   "properties": {
-    "action_name": {
-      "type": "keyword"
-    },
-    "user_id": {
-      "type": "keyword"
-    },
-    "query_id": {
-      "type": "keyword"
-    },
-    "page_id": {
-      "type": "keyword"
-    },
-    "message": {
-      "type": "keyword"
-    },
-    "message_type": {
-      "type": "keyword"
-    },
+    "application": { "type": "keyword", "ignore_above": 256 },
+    "action_name": { "type": "keyword", "ignore_above": 100 },
+    "client_id": { "type": "keyword", "ignore_above": 100 },
+    "message": { "type": "keyword", "ignore_above": 1024 },
+    "message_type": { "type": "keyword", "ignore_above": 100 },
     "timestamp": {
       "type": "date",
+      "format":"rfc3339_lenient||epoch_millis",
+      "ignore_malformed": true, 
       "doc_values": true
     },
     "event_attributes": {
+      "dynamic": true,
       "properties": {
-        "user_name": {
-          "type": "keyword"
-        },
-        "user_id": {
-          "type": "keyword"
-        },
-        "email": {
-          "type": "keyword"
-        },
-        "price": {
-          "type": "float"
-        },
-        "ip": {
-          "type": "ip",
-          "ignore_malformed": true
-        },
-        "browser": {
-          "type": "text",
-          "fields": {
-            "keyword": {
-              "type": "keyword"
-            }
-          }
-        },
         "position": {
           "properties": {
-            "ordinal": {
-              "type": "integer"
-            },
-            "x": {
-              "type": "integer"
-            },
-            "y": {
-              "type": "integer"
-            },
-            "page_depth": {
-              "type": "integer"
-            },
-            "scroll_depth": {
-              "type": "integer"
-            },
-            "trail": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
+            "ordinal": { "type": "integer" },
+            "x": { "type": "integer" },
+            "y": { "type": "integer" },
+            "page_depth": { "type": "integer" },
+            "scroll_depth": { "type": "integer" },
+            "trail": { "type": "text",
+              "fields": { "keyword": { "type": "keyword", "ignore_above": 256 }
               }
             }
           }
         },
         "object": {
           "properties": {
-            "key_value": {
-              "type": "keyword"
-            },
-            "object_id": {
-              "type": "keyword"
-            },
-            "object_type": {
-              "type": "keyword"
-            },
-            "transaction_id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "to_user_id": {
-              "type": "keyword"
-            },
-            "object_detail": {
-              "type": "text"
-            }
+            "internal_id": { "type": "keyword" },
+            "object_id": { "type": "keyword", "ignore_above": 256 },
+            "object_id_field": { "type": "keyword", "ignore_above": 100 },
+            "name": { "type": "keyword", "ignore_above": 256 },
+            "description": { "type": "text",
+              "fields": { "keyword": { "type": "keyword", "ignore_above": 256 } }
+            },
+            "object_detail": { "type": "flat_object" }
           }
         }
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/queries-mapping.json b/src/main/resources/queries-mapping.json
index 457b6fa..4b8c41a 100644
--- a/src/main/resources/queries-mapping.json
+++ b/src/main/resources/queries-mapping.json
@@ -1,34 +1,15 @@
 {
   "dynamic": false,
   "properties": {
-    "timestamp": {
-      "type": "date"
-    },
-    "query_id": {
-      "type": "keyword"
-    },
-    "query": {
-      "type": "text"
-    },
-    "query_response_id": {
-      "type": "keyword"
-    },
-    "query_response_object_ids": {
-      "type": "keyword"
-    },
-    "client_id": {
-      "type": "keyword"
-    },
-    "user_query": {
-      "type": "text",
-      "fields": {
-        "keyword": {
-          "type": "keyword"
-        }
-      }
-    },
-    "query_attributes": {
-      "type": "flat_object"
-    }
+    "timestamp": { "type": "date" },
+    "query_id": { "type": "keyword", "ignore_above": 100 },
+    "query": { "type": "flat_object" },
+    "query_response_id": { "type": "keyword", "ignore_above": 100 },
+    "query_response_hit_ids": { "type": "keyword" },
+    "user_query": { "type": "text",
+      "fields": { "keyword": { "type": "keyword", "ignore_above": 256 } }
+    },
+    "query_attributes": { "type": "flat_object" },
+    "client_id": { "type": "keyword", "ignore_above": 100 }
   }
-}
\ No newline at end of file
+}