diff --git a/src/bitdrift_public/protobuf/logging/v1/payload.proto b/src/bitdrift_public/protobuf/logging/v1/payload.proto
index e117b1e..02ab647 100644
--- a/src/bitdrift_public/protobuf/logging/v1/payload.proto
+++ b/src/bitdrift_public/protobuf/logging/v1/payload.proto
@@ -24,9 +24,19 @@ message Data {
     double double_data = 4;
     int64 sint_data = 5;
     bool bool_data = 6;
+    MapData map_data = 7;
+    ArrayData array_data = 8;
   }
 }
 
+message MapData {
+  map<string, Data> entries = 1;
+}
+
+message ArrayData {
+  repeated Data items = 1;
+}
+
 enum LogType {
   // Normal logs, from application code.
   NORMAL = 0;
diff --git a/src/bitdrift_public/protobuf/value_matcher/v1/value_matcher.proto b/src/bitdrift_public/protobuf/value_matcher/v1/value_matcher.proto
index 8648a6a..f2276b5 100644
--- a/src/bitdrift_public/protobuf/value_matcher/v1/value_matcher.proto
+++ b/src/bitdrift_public/protobuf/value_matcher/v1/value_matcher.proto
@@ -64,18 +64,16 @@ message SemVerValueMatch {
 
 message JsonPathValueMatch {
   Operator operator = 1 [(validate.rules).enum.defined_only = true];
-  message JsonPath {
-    message KeyOrIndex {
-      oneof key_or_index {
-        option (validate.required) = true;
+  message KeyOrIndex {
+    oneof key_or_index {
+      option (validate.required) = true;
 
-        string key = 1 [(validate.rules).string = {min_len: 1}];
-        int32 index = 2;
-      }
+      string key = 1 [(validate.rules).string = {min_len: 1}];
+      int32 index = 2;
     }
-
-    string path = 1 [(validate.rules).string = {min_len: 1}];
   }
+
+  repeated KeyOrIndex key_or_index = 3 [(validate.rules).repeated = {min_items: 1}];
   string match_value = 2 [(validate.rules).string = {min_len: 1}];
 }