diff --git a/ctf/src/main/resources/CTF2-7.0-barectf-event-before-packet/metadata b/ctf/src/main/resources/CTF2-7.0-barectf-event-before-packet/metadata
new file mode 100644
index 0000000..eed7cbe
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-barectf-event-before-packet/metadata
@@ -0,0 +1,221 @@
+{
+  "type": "preamble",
+  "uuid": [
+    67,
+    119,
+    72,
+    222,
+    148,
+    53,
+    17,
+    233,
+    131,
+    83,
+    82,
+    84,
+    0,
+    124,
+    104,
+    87
+  ],
+  "version": 2
+}
+{
+  "environment": {
+    "barectf_gen_date": "2019-06-21T11:00:09.758481",
+    "domain": "bare",
+    "tracer_major": 2,
+    "tracer_minor": 3,
+    "tracer_name": "barectf",
+    "tracer_patch": 0
+  },
+  "packet-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-magic-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "magic"
+      },
+      {
+        "field-class": {
+          "length": 16,
+          "roles": [
+            "metadata-stream-uuid"
+          ],
+          "type": "static-length-blob"
+        },
+        "name": "uuid"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 8,
+          "roles": [
+            "data-stream-class-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "trace-class",
+  "uuid": [
+    67,
+    119,
+    72,
+    222,
+    148,
+    53,
+    17,
+    233,
+    131,
+    83,
+    82,
+    84,
+    0,
+    124,
+    104,
+    87
+  ]
+}
+{
+  "frequency": 1000000000,
+  "name": "default",
+  "offset-from-origin": {
+    "cycles": 0,
+    "seconds": 1434072888
+  },
+  "origin": "unix-epoch",
+  "type": "clock-class"
+}
+{
+  "default-clock-class-name": "default",
+  "event-record-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 64,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp"
+      },
+      {
+        "field-class": {
+          "alignment": 16,
+          "byte-order": "little-endian",
+          "length": 16,
+          "roles": [
+            "event-record-class-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "id"
+      }
+    ],
+    "type": "structure"
+  },
+  "packet-context-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 64,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_begin"
+      },
+      {
+        "field-class": {
+          "alignment": 64,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-end-default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_end"
+      },
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-total-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_size"
+      },
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-content-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "content_size"
+      },
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "discarded-event-record-counter-snapshot"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "events_discarded"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "data-stream-class"
+}
+{
+  "name": "simple_uint32",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "value"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class",
+  "user-attributes": {
+    "babeltrace.org,2020": {
+      "log-level": "critical"
+    }
+  }
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-barectf-event-before-packet/stream b/ctf/src/main/resources/CTF2-7.0-barectf-event-before-packet/stream
new file mode 100644
index 0000000..55f45f2
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-barectf-event-before-packet/stream
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-debug-info/channel0_0 b/ctf/src/main/resources/CTF2-7.0-debug-info/channel0_0
new file mode 100644
index 0000000..35b979b
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-debug-info/channel0_0
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-debug-info/metadata b/ctf/src/main/resources/CTF2-7.0-debug-info/metadata
new file mode 100644
index 0000000..19fc9e6
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-debug-info/metadata
@@ -0,0 +1,447 @@
+{
+  "type": "preamble",
+  "uuid": [
+    210,
+    39,
+    15,
+    90,
+    122,
+    112,
+    69,
+    33,
+    134,
+    11,
+    149,
+    79,
+    5,
+    78,
+    4,
+    107
+  ],
+  "version": 2
+}
+{
+  "environment": {
+    "domain": "ust",
+    "hostname": "raton",
+    "tracer_major": 2,
+    "tracer_minor": 11,
+    "tracer_name": "lttng-ust"
+  },
+  "packet-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-magic-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "magic"
+      },
+      {
+        "field-class": {
+          "length": 16,
+          "roles": [
+            "metadata-stream-uuid"
+          ],
+          "type": "static-length-blob"
+        },
+        "name": "uuid"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "data-stream-class-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_id"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "data-stream-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_instance_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "trace-class",
+  "uuid": [
+    210,
+    39,
+    15,
+    90,
+    122,
+    112,
+    69,
+    33,
+    134,
+    11,
+    149,
+    79,
+    5,
+    78,
+    4,
+    107
+  ]
+}
+{
+  "description": "Monotonic Clock",
+  "frequency": 1000000000,
+  "name": "monotonic",
+  "offset-from-origin": {
+    "cycles": 374722151,
+    "seconds": 1563264475
+  },
+  "type": "clock-class",
+  "uuid": [
+    197,
+    106,
+    214,
+    42,
+    106,
+    53,
+    71,
+    34,
+    152,
+    7,
+    216,
+    224,
+    241,
+    24,
+    163,
+    103
+  ]
+}
+{
+  "default-clock-class-name": "monotonic",
+  "event-record-common-context-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-signed-integer"
+        },
+        "name": "vpid"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "preferred-display-base": 16,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "ip"
+      }
+    ],
+    "type": "structure"
+  },
+  "event-record-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 16,
+          "mappings": {
+            "compact": [
+              [
+                0,
+                65534
+              ]
+            ],
+            "extended": [
+              [
+                65535,
+                65535
+              ]
+            ]
+          },
+          "roles": [
+            "event-record-class-id"
+          ],
+          "type": "fixed-length-unsigned-enumeration"
+        },
+        "name": "id"
+      },
+      {
+        "field-class": {
+          "options": [
+            {
+              "field-class": {
+                "member-classes": [
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 32,
+                      "roles": [
+                        "default-clock-timestamp"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "timestamp"
+                  }
+                ],
+                "type": "structure"
+              },
+              "name": "compact",
+              "selector-field-ranges": [
+                [
+                  0,
+                  65534
+                ]
+              ]
+            },
+            {
+              "field-class": {
+                "member-classes": [
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 32,
+                      "roles": [
+                        "event-record-class-id"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "id"
+                  },
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 64,
+                      "roles": [
+                        "default-clock-timestamp"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "timestamp"
+                  }
+                ],
+                "type": "structure"
+              },
+              "name": "extended",
+              "selector-field-ranges": [
+                [
+                  65535,
+                  65535
+                ]
+              ]
+            }
+          ],
+          "selector-field-location": [
+            "event-record-header",
+            "id"
+          ],
+          "type": "variant"
+        },
+        "name": "v"
+      }
+    ],
+    "minimum-alignment": 8,
+    "type": "structure"
+  },
+  "packet-context-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_begin"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-end-default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_end"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-content-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "content_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-total-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-sequence-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_seq_num"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "discarded-event-record-counter-snapshot"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "events_discarded"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "cpu_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "data-stream-class"
+}
+{
+  "name": "lttng_ust_statedump:bin_info",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "preferred-display-base": 16,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "baddr"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "memsz"
+      },
+      {
+        "field-class": {
+          "type": "null-terminated-string"
+        },
+        "name": "path"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 8,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "is_pic"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 8,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "has_build_id"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 8,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "has_debug_link"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class",
+  "user-attributes": {
+    "babeltrace.org,2020": {
+      "log-level": "debug:line"
+    }
+  }
+}
+{
+  "id": 1,
+  "name": "my_provider:my_first_tracepoint",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "type": "null-terminated-string"
+        },
+        "name": "my_string_field"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-signed-integer"
+        },
+        "name": "my_integer_field"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class",
+  "user-attributes": {
+    "babeltrace.org,2020": {
+      "log-level": "debug:line"
+    }
+  }
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-ev-disc-no-ts-begin-end/metadata b/ctf/src/main/resources/CTF2-7.0-ev-disc-no-ts-begin-end/metadata
new file mode 100644
index 0000000..4601a15
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-ev-disc-no-ts-begin-end/metadata
@@ -0,0 +1,54 @@
+{
+  "type": "preamble",
+  "version": 2
+}
+{
+  "type": "trace-class"
+}
+{
+  "packet-context-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "big-endian",
+          "length": 8,
+          "roles": [
+            "packet-total-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "big-endian",
+          "length": 8,
+          "roles": [
+            "discarded-event-record-counter-snapshot"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "events_discarded"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "data-stream-class"
+}
+{
+  "name": "ev",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "type": "null-terminated-string"
+        },
+        "name": "s"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class"
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-ev-disc-no-ts-begin-end/stream b/ctf/src/main/resources/CTF2-7.0-ev-disc-no-ts-begin-end/stream
new file mode 100644
index 0000000..b42129a
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-ev-disc-no-ts-begin-end/stream
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-lttng-crash/chan_0 b/ctf/src/main/resources/CTF2-7.0-lttng-crash/chan_0
new file mode 100644
index 0000000..a570de8
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-lttng-crash/chan_0
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-lttng-crash/metadata b/ctf/src/main/resources/CTF2-7.0-lttng-crash/metadata
new file mode 100644
index 0000000..4629fcc
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-lttng-crash/metadata
@@ -0,0 +1,356 @@
+{
+  "type": "preamble",
+  "uuid": [
+    167,
+    5,
+    80,
+    101,
+    147,
+    143,
+    67,
+    156,
+    129,
+    142,
+    151,
+    92,
+    19,
+    179,
+    11,
+    226
+  ],
+  "version": 2
+}
+{
+  "environment": {
+    "domain": "ust",
+    "hostname": "raton",
+    "tracer_major": 2,
+    "tracer_minor": 11,
+    "tracer_name": "lttng-ust"
+  },
+  "packet-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-magic-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "magic"
+      },
+      {
+        "field-class": {
+          "length": 16,
+          "roles": [
+            "metadata-stream-uuid"
+          ],
+          "type": "static-length-blob"
+        },
+        "name": "uuid"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "data-stream-class-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_id"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "data-stream-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_instance_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "trace-class",
+  "uuid": [
+    167,
+    5,
+    80,
+    101,
+    147,
+    143,
+    67,
+    156,
+    129,
+    142,
+    151,
+    92,
+    19,
+    179,
+    11,
+    226
+  ]
+}
+{
+  "description": "Monotonic Clock",
+  "frequency": 1000000000,
+  "name": "monotonic",
+  "offset-from-origin": {
+    "cycles": 54742594,
+    "seconds": 1565056443
+  },
+  "type": "clock-class",
+  "uuid": [
+    77,
+    118,
+    219,
+    114,
+    228,
+    15,
+    64,
+    158,
+    186,
+    48,
+    83,
+    45,
+    48,
+    157,
+    80,
+    72
+  ]
+}
+{
+  "default-clock-class-name": "monotonic",
+  "event-record-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 16,
+          "mappings": {
+            "compact": [
+              [
+                0,
+                65534
+              ]
+            ],
+            "extended": [
+              [
+                65535,
+                65535
+              ]
+            ]
+          },
+          "roles": [
+            "event-record-class-id"
+          ],
+          "type": "fixed-length-unsigned-enumeration"
+        },
+        "name": "id"
+      },
+      {
+        "field-class": {
+          "options": [
+            {
+              "field-class": {
+                "member-classes": [
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 32,
+                      "roles": [
+                        "default-clock-timestamp"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "timestamp"
+                  }
+                ],
+                "type": "structure"
+              },
+              "name": "compact",
+              "selector-field-ranges": [
+                [
+                  0,
+                  65534
+                ]
+              ]
+            },
+            {
+              "field-class": {
+                "member-classes": [
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 32,
+                      "roles": [
+                        "event-record-class-id"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "id"
+                  },
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 64,
+                      "roles": [
+                        "default-clock-timestamp"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "timestamp"
+                  }
+                ],
+                "type": "structure"
+              },
+              "name": "extended",
+              "selector-field-ranges": [
+                [
+                  65535,
+                  65535
+                ]
+              ]
+            }
+          ],
+          "selector-field-location": [
+            "event-record-header",
+            "id"
+          ],
+          "type": "variant"
+        },
+        "name": "v"
+      }
+    ],
+    "minimum-alignment": 8,
+    "type": "structure"
+  },
+  "packet-context-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_begin"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-end-default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_end"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-content-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "content_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-total-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-sequence-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_seq_num"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "discarded-event-record-counter-snapshot"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "events_discarded"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "cpu_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "data-stream-class"
+}
+{
+  "name": "my_app:current_temp",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-signed-integer"
+        },
+        "name": "temp"
+      },
+      {
+        "field-class": {
+          "type": "null-terminated-string"
+        },
+        "name": "status"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class",
+  "user-attributes": {
+    "babeltrace.org,2020": {
+      "log-level": "debug:line"
+    }
+  }
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-lttng-event-after-packet/chan_0 b/ctf/src/main/resources/CTF2-7.0-lttng-event-after-packet/chan_0
new file mode 100644
index 0000000..fffcccd
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-lttng-event-after-packet/chan_0
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-lttng-event-after-packet/metadata b/ctf/src/main/resources/CTF2-7.0-lttng-event-after-packet/metadata
new file mode 100644
index 0000000..fc153b6
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-lttng-event-after-packet/metadata
@@ -0,0 +1,356 @@
+{
+  "type": "preamble",
+  "uuid": [
+    232,
+    104,
+    15,
+    99,
+    51,
+    107,
+    73,
+    153,
+    155,
+    107,
+    8,
+    15,
+    28,
+    27,
+    159,
+    123
+  ],
+  "version": 2
+}
+{
+  "environment": {
+    "domain": "ust",
+    "hostname": "raton",
+    "tracer_major": 2,
+    "tracer_minor": 10,
+    "tracer_name": "lttng-ust"
+  },
+  "packet-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-magic-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "magic"
+      },
+      {
+        "field-class": {
+          "length": 16,
+          "roles": [
+            "metadata-stream-uuid"
+          ],
+          "type": "static-length-blob"
+        },
+        "name": "uuid"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "data-stream-class-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_id"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "data-stream-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_instance_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "trace-class",
+  "uuid": [
+    232,
+    104,
+    15,
+    99,
+    51,
+    107,
+    73,
+    153,
+    155,
+    107,
+    8,
+    15,
+    28,
+    27,
+    159,
+    123
+  ]
+}
+{
+  "description": "Monotonic Clock",
+  "frequency": 1000000000,
+  "name": "monotonic",
+  "offset-from-origin": {
+    "cycles": 54742596,
+    "seconds": 1565056443
+  },
+  "type": "clock-class",
+  "uuid": [
+    77,
+    118,
+    219,
+    114,
+    228,
+    15,
+    64,
+    158,
+    186,
+    48,
+    83,
+    45,
+    48,
+    157,
+    80,
+    72
+  ]
+}
+{
+  "default-clock-class-name": "monotonic",
+  "event-record-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 16,
+          "mappings": {
+            "compact": [
+              [
+                0,
+                65534
+              ]
+            ],
+            "extended": [
+              [
+                65535,
+                65535
+              ]
+            ]
+          },
+          "roles": [
+            "event-record-class-id"
+          ],
+          "type": "fixed-length-unsigned-enumeration"
+        },
+        "name": "id"
+      },
+      {
+        "field-class": {
+          "options": [
+            {
+              "field-class": {
+                "member-classes": [
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 32,
+                      "roles": [
+                        "default-clock-timestamp"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "timestamp"
+                  }
+                ],
+                "type": "structure"
+              },
+              "name": "compact",
+              "selector-field-ranges": [
+                [
+                  0,
+                  65534
+                ]
+              ]
+            },
+            {
+              "field-class": {
+                "member-classes": [
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 32,
+                      "roles": [
+                        "event-record-class-id"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "id"
+                  },
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 64,
+                      "roles": [
+                        "default-clock-timestamp"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "timestamp"
+                  }
+                ],
+                "type": "structure"
+              },
+              "name": "extended",
+              "selector-field-ranges": [
+                [
+                  65535,
+                  65535
+                ]
+              ]
+            }
+          ],
+          "selector-field-location": [
+            "event-record-header",
+            "id"
+          ],
+          "type": "variant"
+        },
+        "name": "v"
+      }
+    ],
+    "minimum-alignment": 8,
+    "type": "structure"
+  },
+  "packet-context-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_begin"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-end-default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_end"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-content-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "content_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-total-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-sequence-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_seq_num"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "discarded-event-record-counter-snapshot"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "events_discarded"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "cpu_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "data-stream-class"
+}
+{
+  "name": "my_app:current_temp",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-signed-integer"
+        },
+        "name": "temp"
+      },
+      {
+        "field-class": {
+          "type": "null-terminated-string"
+        },
+        "name": "status"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class",
+  "user-attributes": {
+    "babeltrace.org,2020": {
+      "log-level": "debug:line"
+    }
+  }
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-meta-variant-no-underscore/metadata b/ctf/src/main/resources/CTF2-7.0-meta-variant-no-underscore/metadata
new file mode 100644
index 0000000..7810edf
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-meta-variant-no-underscore/metadata
@@ -0,0 +1,96 @@
+{
+  "type": "preamble",
+  "version": 2
+}
+{
+  "type": "trace-class"
+}
+{
+  "type": "data-stream-class"
+}
+{
+  "name": "yo",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "big-endian",
+          "length": 8,
+          "mappings": {
+            "COSSETTE": [
+              [
+                0,
+                0
+              ]
+            ],
+            "PELCHAT": [
+              [
+                1,
+                1
+              ]
+            ],
+            "VOISINE": [
+              [
+                2,
+                2
+              ]
+            ]
+          },
+          "type": "fixed-length-unsigned-enumeration"
+        },
+        "name": "tag"
+      },
+      {
+        "field-class": {
+          "options": [
+            {
+              "field-class": {
+                "type": "null-terminated-string"
+              },
+              "name": "COSSETTE",
+              "selector-field-ranges": [
+                [
+                  0,
+                  0
+                ]
+              ]
+            },
+            {
+              "field-class": {
+                "type": "null-terminated-string"
+              },
+              "name": "PELCHAT",
+              "selector-field-ranges": [
+                [
+                  1,
+                  1
+                ]
+              ]
+            },
+            {
+              "field-class": {
+                "type": "null-terminated-string"
+              },
+              "name": "VOISINE",
+              "selector-field-ranges": [
+                [
+                  2,
+                  2
+                ]
+              ]
+            }
+          ],
+          "selector-field-location": [
+            "event-record-payload",
+            "tag"
+          ],
+          "type": "variant"
+        },
+        "name": "var"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class"
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-meta-variant-no-underscore/stream b/ctf/src/main/resources/CTF2-7.0-meta-variant-no-underscore/stream
new file mode 100644
index 0000000..f54d73f
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-meta-variant-no-underscore/stream
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-smalltrace/dummystream b/ctf/src/main/resources/CTF2-7.0-smalltrace/dummystream
new file mode 100644
index 0000000..469cb9a
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-smalltrace/dummystream
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-smalltrace/metadata b/ctf/src/main/resources/CTF2-7.0-smalltrace/metadata
new file mode 100644
index 0000000..a3d4191
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-smalltrace/metadata
@@ -0,0 +1,89 @@
+{
+  "type": "preamble",
+  "uuid": [
+    42,
+    100,
+    34,
+    208,
+    108,
+    238,
+    17,
+    224,
+    140,
+    8,
+    203,
+    7,
+    215,
+    179,
+    165,
+    100
+  ],
+  "version": 2
+}
+{
+  "packet-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "preferred-display-base": 16,
+          "roles": [
+            "packet-magic-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "magic"
+      },
+      {
+        "field-class": {
+          "length": 16,
+          "roles": [
+            "metadata-stream-uuid"
+          ],
+          "type": "static-length-blob"
+        },
+        "name": "uuid"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "trace-class",
+  "uuid": [
+    42,
+    100,
+    34,
+    208,
+    108,
+    238,
+    17,
+    224,
+    140,
+    8,
+    203,
+    7,
+    215,
+    179,
+    165,
+    100
+  ]
+}
+{
+  "type": "data-stream-class"
+}
+{
+  "name": "string",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "type": "null-terminated-string"
+        },
+        "name": "str"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class"
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-succeed1/dummystream b/ctf/src/main/resources/CTF2-7.0-succeed1/dummystream
new file mode 100644
index 0000000..53d735e
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-succeed1/dummystream
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-succeed1/metadata b/ctf/src/main/resources/CTF2-7.0-succeed1/metadata
new file mode 100644
index 0000000..0ba2253
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-succeed1/metadata
@@ -0,0 +1,117 @@
+{
+  "type": "preamble",
+  "uuid": [
+    42,
+    100,
+    34,
+    208,
+    108,
+    238,
+    17,
+    224,
+    140,
+    8,
+    203,
+    7,
+    215,
+    179,
+    165,
+    100
+  ],
+  "version": 2
+}
+{
+  "packet-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-magic-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "magic"
+      },
+      {
+        "field-class": {
+          "length": 16,
+          "roles": [
+            "metadata-stream-uuid"
+          ],
+          "type": "static-length-blob"
+        },
+        "name": "uuid"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "trace-class",
+  "uuid": [
+    42,
+    100,
+    34,
+    208,
+    108,
+    238,
+    17,
+    224,
+    140,
+    8,
+    203,
+    7,
+    215,
+    179,
+    165,
+    100
+  ]
+}
+{
+  "packet-context-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-content-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "content_size"
+      },
+      {
+        "field-class": {
+          "alignment": 32,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-total-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_size"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "data-stream-class"
+}
+{
+  "name": "string",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "type": "null-terminated-string"
+        },
+        "name": "str"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class"
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_0.idx b/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_0.idx
new file mode 100644
index 0000000..bf42f28
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_0.idx
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_1.idx b/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_1.idx
new file mode 100644
index 0000000..ba9bd23
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_1.idx
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_2.idx b/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_2.idx
new file mode 100644
index 0000000..425ba0d
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_2.idx
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_3.idx b/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_3.idx
new file mode 100644
index 0000000..4fc275e
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/index/ust_channel_3.idx
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/metadata b/ctf/src/main/resources/CTF2-7.0-trace-with-index/metadata
new file mode 100644
index 0000000..ae95a63
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/metadata
@@ -0,0 +1,347 @@
+{
+  "type": "preamble",
+  "uuid": [
+    227,
+    117,
+    250,
+    175,
+    90,
+    50,
+    64,
+    28,
+    134,
+    128,
+    121,
+    87,
+    194,
+    4,
+    240,
+    100
+  ],
+  "version": 2
+}
+{
+  "environment": {
+    "domain": "ust",
+    "hostname": "joraj-alpa",
+    "tracer_major": 2,
+    "tracer_minor": 11,
+    "tracer_name": "lttng-ust"
+  },
+  "packet-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "packet-magic-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "magic"
+      },
+      {
+        "field-class": {
+          "length": 16,
+          "roles": [
+            "metadata-stream-uuid"
+          ],
+          "type": "static-length-blob"
+        },
+        "name": "uuid"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "roles": [
+            "data-stream-class-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_id"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "data-stream-id"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "stream_instance_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "trace-class",
+  "uuid": [
+    227,
+    117,
+    250,
+    175,
+    90,
+    50,
+    64,
+    28,
+    134,
+    128,
+    121,
+    87,
+    194,
+    4,
+    240,
+    100
+  ]
+}
+{
+  "description": "Monotonic Clock",
+  "frequency": 1000000000,
+  "name": "monotonic",
+  "offset-from-origin": {
+    "cycles": 484157339,
+    "seconds": 1564079206
+  },
+  "type": "clock-class",
+  "uuid": [
+    136,
+    203,
+    160,
+    22,
+    54,
+    226,
+    72,
+    194,
+    175,
+    248,
+    62,
+    75,
+    154,
+    239,
+    176,
+    92
+  ]
+}
+{
+  "default-clock-class-name": "monotonic",
+  "event-record-header-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 16,
+          "mappings": {
+            "compact": [
+              [
+                0,
+                65534
+              ]
+            ],
+            "extended": [
+              [
+                65535,
+                65535
+              ]
+            ]
+          },
+          "roles": [
+            "event-record-class-id"
+          ],
+          "type": "fixed-length-unsigned-enumeration"
+        },
+        "name": "id"
+      },
+      {
+        "field-class": {
+          "options": [
+            {
+              "field-class": {
+                "member-classes": [
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 32,
+                      "roles": [
+                        "default-clock-timestamp"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "timestamp"
+                  }
+                ],
+                "type": "structure"
+              },
+              "name": "compact",
+              "selector-field-ranges": [
+                [
+                  0,
+                  65534
+                ]
+              ]
+            },
+            {
+              "field-class": {
+                "member-classes": [
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 32,
+                      "roles": [
+                        "event-record-class-id"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "id"
+                  },
+                  {
+                    "field-class": {
+                      "alignment": 8,
+                      "byte-order": "little-endian",
+                      "length": 64,
+                      "roles": [
+                        "default-clock-timestamp"
+                      ],
+                      "type": "fixed-length-unsigned-integer"
+                    },
+                    "name": "timestamp"
+                  }
+                ],
+                "type": "structure"
+              },
+              "name": "extended",
+              "selector-field-ranges": [
+                [
+                  65535,
+                  65535
+                ]
+              ]
+            }
+          ],
+          "selector-field-location": [
+            "event-record-header",
+            "id"
+          ],
+          "type": "variant"
+        },
+        "name": "v"
+      }
+    ],
+    "minimum-alignment": 8,
+    "type": "structure"
+  },
+  "packet-context-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_begin"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-end-default-clock-timestamp"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "timestamp_end"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-content-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "content_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-total-length"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_size"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "packet-sequence-number"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "packet_seq_num"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 64,
+          "roles": [
+            "discarded-event-record-counter-snapshot"
+          ],
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "events_discarded"
+      },
+      {
+        "field-class": {
+          "alignment": 8,
+          "byte-order": "little-endian",
+          "length": 32,
+          "type": "fixed-length-unsigned-integer"
+        },
+        "name": "cpu_id"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "data-stream-class"
+}
+{
+  "name": "sample_component:message",
+  "payload-field-class": {
+    "member-classes": [
+      {
+        "field-class": {
+          "type": "null-terminated-string"
+        },
+        "name": "message"
+      }
+    ],
+    "type": "structure"
+  },
+  "type": "event-record-class",
+  "user-attributes": {
+    "babeltrace.org,2020": {
+      "log-level": "warning"
+    }
+  }
+}
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_0 b/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_0
new file mode 100644
index 0000000..f26876b
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_0
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_1 b/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_1
new file mode 100644
index 0000000..f0bdf93
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_1
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_2 b/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_2
new file mode 100644
index 0000000..1f0cb5f
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_2
Binary files differ
diff --git a/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_3 b/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_3
new file mode 100644
index 0000000..7f8c7c4
--- /dev/null
+++ b/ctf/src/main/resources/CTF2-7.0-trace-with-index/ust_channel_3
Binary files differ