diff --git a/output/schema/schema.json b/output/schema/schema.json
index cd6f66ba79..4c036cc16e 100644
--- a/output/schema/schema.json
+++ b/output/schema/schema.json
@@ -38814,9 +38814,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 540,
+        "endLine": 551,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 538
+        "startLine": 549
       },
       "variantName": "adjacency_matrix"
     },
@@ -38879,9 +38879,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 542,
+        "endLine": 553,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 542
+        "startLine": 553
       }
     },
     {
@@ -38891,7 +38891,7 @@
         "namespace": "_types.aggregations"
       },
       "specLocation": {
-        "endLine": 109,
+        "endLine": 111,
         "path": "_types/aggregations/Aggregate.ts",
         "startLine": 30
       },
@@ -39170,6 +39170,20 @@
               "namespace": "_types.aggregations"
             }
           },
+          {
+            "kind": "instance_of",
+            "type": {
+              "name": "ChildrenAggregate",
+              "namespace": "_types.aggregations"
+            }
+          },
+          {
+            "kind": "instance_of",
+            "type": {
+              "name": "ParentAggregate",
+              "namespace": "_types.aggregations"
+            }
+          },
           {
             "kind": "instance_of",
             "type": {
@@ -39177,6 +39191,13 @@
               "namespace": "_types.aggregations"
             }
           },
+          {
+            "kind": "instance_of",
+            "type": {
+              "name": "UnmappedSamplerAggregate",
+              "namespace": "_types.aggregations"
+            }
+          },
           {
             "kind": "instance_of",
             "type": {
@@ -39331,13 +39352,6 @@
               "namespace": "_types.aggregations"
             }
           },
-          {
-            "kind": "instance_of",
-            "type": {
-              "name": "ChildrenAggregate",
-              "namespace": "_types.aggregations"
-            }
-          },
           {
             "kind": "instance_of",
             "type": {
@@ -39379,9 +39393,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 122,
+        "endLine": 124,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 120
+        "startLine": 122
       }
     },
     {
@@ -40385,9 +40399,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 150,
+        "endLine": 152,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 146
+        "startLine": 148
       }
     },
     {
@@ -40425,9 +40439,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 344,
+        "endLine": 346,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 340
+        "startLine": 342
       },
       "variantName": "auto_date_histogram"
     },
@@ -40609,9 +40623,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 196,
+        "endLine": 198,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 195
+        "startLine": 197
       },
       "variantName": "avg"
     },
@@ -40784,9 +40798,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 659,
+        "endLine": 670,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 643
+        "startLine": 654
       },
       "variantName": "box_plot"
     },
@@ -40870,9 +40884,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 222,
+        "endLine": 224,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 219
+        "startLine": 221
       },
       "variantName": "bucket_metric_value"
     },
@@ -41020,9 +41034,9 @@
         "namespace": "_types.aggregations"
       },
       "specLocation": {
-        "endLine": 309,
+        "endLine": 311,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 300
+        "startLine": 302
       },
       "type": {
         "items": [
@@ -41204,9 +41218,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 127,
+        "endLine": 129,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 124
+        "startLine": 126
       },
       "variantName": "cardinality"
     },
@@ -41288,56 +41302,28 @@
         "startLine": 285
       }
     },
-    {
-      "inherits": {
-        "generics": [
-          {
-            "kind": "instance_of",
-            "type": {
-              "name": "ChildrenAggregateBucket",
-              "namespace": "_types.aggregations"
-            }
-          }
-        ],
-        "type": {
-          "name": "MultiBucketAggregateBase",
-          "namespace": "_types.aggregations"
-        }
-      },
-      "kind": "interface",
-      "name": {
-        "name": "ChildrenAggregate",
-        "namespace": "_types.aggregations"
-      },
-      "properties": [],
-      "specLocation": {
-        "endLine": 716,
-        "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 715
-      },
-      "variantName": "children"
-    },
     {
       "attachedBehaviors": [
         "AdditionalProperties"
       ],
       "inherits": {
         "type": {
-          "name": "MultiBucketBase",
+          "name": "SingleBucketAggregateBase",
           "namespace": "_types.aggregations"
         }
       },
       "kind": "interface",
       "name": {
-        "name": "ChildrenAggregateBucket",
+        "name": "ChildrenAggregate",
         "namespace": "_types.aggregations"
       },
       "properties": [],
       "specLocation": {
-        "endLine": 718,
+        "endLine": 727,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 718
-      }
+        "startLine": 726
+      },
+      "variantName": "children"
     },
     {
       "inherits": {
@@ -41487,9 +41473,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 578,
+        "endLine": 589,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 574
+        "startLine": 585
       },
       "variantName": "composite"
     },
@@ -41684,9 +41670,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 582,
+        "endLine": 593,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 580
+        "startLine": 591
       }
     },
     {
@@ -41727,9 +41713,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 694,
+        "endLine": 705,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 686
+        "startLine": 697
       },
       "variantName": "simple_long_value"
     },
@@ -41794,9 +41780,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 333,
+        "endLine": 335,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 332
+        "startLine": 334
       },
       "variantName": "date_histogram"
     },
@@ -42050,9 +42036,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 338,
+        "endLine": 340,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 335
+        "startLine": 337
       }
     },
     {
@@ -42070,9 +42056,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 514,
+        "endLine": 525,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 509
+        "startLine": 520
       },
       "variantName": "date_range"
     },
@@ -42249,9 +42235,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 217,
+        "endLine": 219,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 213
+        "startLine": 215
       },
       "variantName": "derivative"
     },
@@ -42373,9 +42359,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 400,
+        "endLine": 402,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 395
+        "startLine": 397
       },
       "variantName": "dterms"
     },
@@ -42419,9 +42405,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 405,
+        "endLine": 407,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 402
+        "startLine": 404
       }
     },
     {
@@ -42737,9 +42723,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 280,
+        "endLine": 282,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 264
+        "startLine": 266
       },
       "variantName": "extended_stats"
     },
@@ -42788,9 +42774,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 283,
+        "endLine": 285,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 282
+        "startLine": 284
       },
       "variantName": "extended_stats_bucket"
     },
@@ -42862,6 +42848,9 @@
       }
     },
     {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
       "inherits": {
         "type": {
           "name": "SingleBucketAggregateBase",
@@ -42875,9 +42864,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 474,
+        "endLine": 482,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 473
+        "startLine": 481
       },
       "variantName": "filter"
     },
@@ -42904,9 +42893,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 534,
+        "endLine": 545,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 533
+        "startLine": 544
       },
       "variantName": "filters"
     },
@@ -43000,9 +42989,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 536,
+        "endLine": 547,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 536
+        "startLine": 547
       }
     },
     {
@@ -43113,9 +43102,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 290,
+        "endLine": 292,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 287
+        "startLine": 289
       },
       "variantName": "geo_bounds"
     },
@@ -43187,9 +43176,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 296,
+        "endLine": 298,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 292
+        "startLine": 294
       },
       "variantName": "geo_centroid"
     },
@@ -43250,9 +43239,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 520,
+        "endLine": 531,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 516
+        "startLine": 527
       },
       "variantName": "geo_distance"
     },
@@ -43357,9 +43346,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 483,
+        "endLine": 494,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 481
+        "startLine": 492
       },
       "variantName": "geohash_grid"
     },
@@ -43467,9 +43456,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 487,
+        "endLine": 498,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 485
+        "startLine": 496
       }
     },
     {
@@ -43509,9 +43498,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 731,
+        "endLine": 738,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 727
+        "startLine": 734
       },
       "variantName": "geo_line"
     },
@@ -43657,9 +43646,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 491,
+        "endLine": 502,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 489
+        "startLine": 500
       },
       "variantName": "geotile_grid"
     },
@@ -43767,12 +43756,15 @@
         }
       ],
       "specLocation": {
-        "endLine": 495,
+        "endLine": 506,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 493
+        "startLine": 504
       }
     },
     {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
       "inherits": {
         "type": {
           "name": "SingleBucketAggregateBase",
@@ -43786,9 +43778,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 471,
+        "endLine": 479,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 470
+        "startLine": 478
       },
       "variantName": "global"
     },
@@ -43875,9 +43867,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 156,
+        "endLine": 158,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 155
+        "startLine": 157
       },
       "variantName": "hdr_percentile_ranks"
     },
@@ -43895,9 +43887,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 153,
+        "endLine": 155,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 152
+        "startLine": 154
       },
       "variantName": "hdr_percentiles"
     },
@@ -43924,9 +43916,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 325,
+        "endLine": 327,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 324
+        "startLine": 326
       },
       "variantName": "histogram"
     },
@@ -44129,9 +44121,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 330,
+        "endLine": 332,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 327
+        "startLine": 329
       }
     },
     {
@@ -44474,9 +44466,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 607,
+        "endLine": 618,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 596
+        "startLine": 607
       },
       "variantName": "inference"
     },
@@ -44553,9 +44545,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 624,
+        "endLine": 635,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 621
+        "startLine": 632
       }
     },
     {
@@ -44641,9 +44633,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 619,
+        "endLine": 630,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 615
+        "startLine": 626
       }
     },
     {
@@ -44688,9 +44680,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 613,
+        "endLine": 624,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 609
+        "startLine": 620
       }
     },
     {
@@ -44716,9 +44708,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 524,
+        "endLine": 535,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 522
+        "startLine": 533
       },
       "variantName": "ip_range"
     },
@@ -44854,9 +44846,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 529,
+        "endLine": 540,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 526
+        "startLine": 537
       }
     },
     {
@@ -44866,9 +44858,9 @@
         "namespace": "_types.aggregations"
       },
       "specLocation": {
-        "endLine": 144,
+        "endLine": 146,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 144
+        "startLine": 146
       },
       "type": {
         "key": {
@@ -44971,9 +44963,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 420,
+        "endLine": 422,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 415
+        "startLine": 417
       },
       "variantName": "lrareterms"
     },
@@ -45017,9 +45009,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 425,
+        "endLine": 427,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 422
+        "startLine": 424
       }
     },
     {
@@ -45046,9 +45038,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 388,
+        "endLine": 390,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 383
+        "startLine": 385
       },
       "variantName": "lterms"
     },
@@ -45092,9 +45084,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 393,
+        "endLine": 395,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 390
+        "startLine": 392
       }
     },
     {
@@ -45190,9 +45182,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 700,
+        "endLine": 711,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 696
+        "startLine": 707
       },
       "variantName": "matrix_stats"
     },
@@ -45346,9 +45338,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 711,
+        "endLine": 722,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 702
+        "startLine": 713
       }
     },
     {
@@ -45365,9 +45357,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 187,
+        "endLine": 189,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 186
+        "startLine": 188
       },
       "variantName": "max"
     },
@@ -45423,9 +45415,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 181,
+        "endLine": 183,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 180
+        "startLine": 182
       },
       "variantName": "median_absolute_deviation"
     },
@@ -45521,9 +45513,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 184,
+        "endLine": 186,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 183
+        "startLine": 185
       },
       "variantName": "min"
     },
@@ -45643,6 +45635,9 @@
       }
     },
     {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
       "inherits": {
         "type": {
           "name": "SingleBucketAggregateBase",
@@ -45656,9 +45651,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 462,
+        "endLine": 470,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 461
+        "startLine": 469
       },
       "variantName": "missing"
     },
@@ -45983,9 +45978,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 313,
+        "endLine": 315,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 311
+        "startLine": 313
       }
     },
     {
@@ -46036,9 +46031,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 322,
+        "endLine": 324,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 315
+        "startLine": 317
       }
     },
     {
@@ -46089,9 +46084,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 447,
+        "endLine": 449,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 445
+        "startLine": 447
       },
       "variantName": "multi_terms"
     },
@@ -46202,9 +46197,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 453,
+        "endLine": 455,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 449
+        "startLine": 451
       }
     },
     {
@@ -46244,6 +46239,9 @@
       }
     },
     {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
       "inherits": {
         "type": {
           "name": "SingleBucketAggregateBase",
@@ -46257,9 +46255,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 465,
+        "endLine": 473,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 464
+        "startLine": 472
       },
       "variantName": "nested"
     },
@@ -46358,6 +46356,29 @@
         "startLine": 193
       }
     },
+    {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
+      "inherits": {
+        "type": {
+          "name": "SingleBucketAggregateBase",
+          "namespace": "_types.aggregations"
+        }
+      },
+      "kind": "interface",
+      "name": {
+        "name": "ParentAggregate",
+        "namespace": "_types.aggregations"
+      },
+      "properties": [],
+      "specLocation": {
+        "endLine": 730,
+        "path": "_types/aggregations/Aggregate.ts",
+        "startLine": 729
+      },
+      "variantName": "parent"
+    },
     {
       "inherits": {
         "type": {
@@ -46492,9 +46513,9 @@
         "namespace": "_types.aggregations"
       },
       "specLocation": {
-        "endLine": 137,
+        "endLine": 139,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 136
+        "startLine": 138
       },
       "type": {
         "items": [
@@ -46545,9 +46566,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 134,
+        "endLine": 136,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 132
+        "startLine": 134
       }
     },
     {
@@ -46631,9 +46652,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 165,
+        "endLine": 167,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 164
+        "startLine": 166
       },
       "variantName": "percentiles_bucket"
     },
@@ -46747,9 +46768,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 500,
+        "endLine": 511,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 499
+        "startLine": 510
       },
       "variantName": "range"
     },
@@ -46893,9 +46914,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 507,
+        "endLine": 518,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 502
+        "startLine": 513
       }
     },
     {
@@ -47032,9 +47053,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 684,
+        "endLine": 695,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 680
+        "startLine": 691
       },
       "variantName": "rate"
     },
@@ -47140,6 +47161,9 @@
       }
     },
     {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
       "inherits": {
         "type": {
           "name": "SingleBucketAggregateBase",
@@ -47153,9 +47177,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 468,
+        "endLine": 476,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 467
+        "startLine": 475
       },
       "variantName": "reverse_nested"
     },
@@ -47191,6 +47215,9 @@
       }
     },
     {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
       "inherits": {
         "type": {
           "name": "SingleBucketAggregateBase",
@@ -47204,9 +47231,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 477,
+        "endLine": 485,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 476
+        "startLine": 484
       },
       "variantName": "sampler"
     },
@@ -47311,9 +47338,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 589,
+        "endLine": 600,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 586
+        "startLine": 597
       },
       "variantName": "scripted_metric"
     },
@@ -47453,9 +47480,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 546,
+        "endLine": 557,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 544
+        "startLine": 555
       },
       "variantName": "siglterms"
     },
@@ -47499,9 +47526,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 556,
+        "endLine": 567,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 553
+        "startLine": 564
       }
     },
     {
@@ -47527,9 +47554,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 560,
+        "endLine": 571,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 558
+        "startLine": 569
       },
       "variantName": "sigsterms"
     },
@@ -47562,9 +47589,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 564,
+        "endLine": 575,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 562
+        "startLine": 573
       }
     },
     {
@@ -47796,9 +47823,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 551,
+        "endLine": 562,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 548
+        "startLine": 559
       }
     },
     {
@@ -48065,13 +48092,41 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 211,
+        "endLine": 213,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 210
+        "startLine": 212
       },
       "variantName": "simple_value"
     },
     {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
+      "behaviors": [
+        {
+          "generics": [
+            {
+              "kind": "instance_of",
+              "type": {
+                "name": "AggregateName",
+                "namespace": "_types"
+              }
+            },
+            {
+              "kind": "instance_of",
+              "type": {
+                "name": "Aggregate",
+                "namespace": "_types.aggregations"
+              }
+            }
+          ],
+          "type": {
+            "name": "AdditionalProperties",
+            "namespace": "_spec_utils"
+          }
+        }
+      ],
+      "description": "Base type for single-bucket aggregation results that can hold sub-aggregations results.",
       "inherits": {
         "type": {
           "name": "AggregateBase",
@@ -48097,9 +48152,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 459,
+        "endLine": 467,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 457
+        "startLine": 459
       }
     },
     {
@@ -48152,9 +48207,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 178,
+        "endLine": 180,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 169
+        "startLine": 171
       }
     },
     {
@@ -48304,9 +48359,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 253,
+        "endLine": 255,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 246
+        "startLine": 248
       }
     },
     {
@@ -48384,9 +48439,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 262,
+        "endLine": 264,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 255
+        "startLine": 257
       }
     },
     {
@@ -48540,9 +48595,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 241,
+        "endLine": 243,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 226
+        "startLine": 228
       },
       "variantName": "stats"
     },
@@ -48579,9 +48634,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 244,
+        "endLine": 246,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 243
+        "startLine": 245
       },
       "variantName": "stats_bucket"
     },
@@ -48628,9 +48683,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 431,
+        "endLine": 433,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 427
+        "startLine": 429
       },
       "variantName": "srareterms"
     },
@@ -48663,9 +48718,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 435,
+        "endLine": 437,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 433
+        "startLine": 435
       }
     },
     {
@@ -48842,9 +48897,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 641,
+        "endLine": 652,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 630
+        "startLine": 641
       },
       "variantName": "string_stats"
     },
@@ -48903,9 +48958,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 373,
+        "endLine": 375,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 368
+        "startLine": 370
       },
       "variantName": "sterms"
     },
@@ -48938,9 +48993,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 381,
+        "endLine": 383,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 379
+        "startLine": 381
       }
     },
     {
@@ -48958,9 +49013,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 193,
+        "endLine": 195,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 189
+        "startLine": 191
       },
       "variantName": "sum"
     },
@@ -49041,9 +49096,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 162,
+        "endLine": 164,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 161
+        "startLine": 163
       },
       "variantName": "tdigest_percentile_ranks"
     },
@@ -49061,9 +49116,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 159,
+        "endLine": 161,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 158
+        "startLine": 160
       },
       "variantName": "tdigest_percentiles"
     },
@@ -49116,9 +49171,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 678,
+        "endLine": 689,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 674
+        "startLine": 685
       },
       "variantName": "t_test"
     },
@@ -49250,9 +49305,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 366,
+        "endLine": 368,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 361
+        "startLine": 363
       }
     },
     {
@@ -49571,9 +49626,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 377,
+        "endLine": 379,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 375
+        "startLine": 377
       }
     },
     {
@@ -49774,9 +49829,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 594,
+        "endLine": 605,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 591
+        "startLine": 602
       },
       "variantName": "top_hits"
     },
@@ -50012,9 +50067,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 672,
+        "endLine": 683,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 668
+        "startLine": 679
       }
     },
     {
@@ -50040,9 +50095,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 662,
+        "endLine": 673,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 661
+        "startLine": 672
       },
       "variantName": "top_metrics"
     },
@@ -50146,9 +50201,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 666,
+        "endLine": 677,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 664
+        "startLine": 675
       }
     },
     {
@@ -50200,12 +50255,35 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 443,
+        "endLine": 445,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 437
+        "startLine": 439
       },
       "variantName": "umrareterms"
     },
+    {
+      "attachedBehaviors": [
+        "AdditionalProperties"
+      ],
+      "inherits": {
+        "type": {
+          "name": "SingleBucketAggregateBase",
+          "namespace": "_types.aggregations"
+        }
+      },
+      "kind": "interface",
+      "name": {
+        "name": "UnmappedSamplerAggregate",
+        "namespace": "_types.aggregations"
+      },
+      "properties": [],
+      "specLocation": {
+        "endLine": 488,
+        "path": "_types/aggregations/Aggregate.ts",
+        "startLine": 487
+      },
+      "variantName": "unmapped_sampler"
+    },
     {
       "description": "Result of the `significant_terms` aggregation on an unmapped field. `buckets` is always empty.",
       "inherits": {
@@ -50230,9 +50308,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 572,
+        "endLine": 583,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 566
+        "startLine": 577
       },
       "variantName": "umsigterms"
     },
@@ -50260,9 +50338,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 413,
+        "endLine": 415,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 407
+        "startLine": 409
       },
       "variantName": "umterms"
     },
@@ -50281,9 +50359,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 208,
+        "endLine": 210,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 204
+        "startLine": 206
       },
       "variantName": "value_count"
     },
@@ -50373,9 +50451,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 348,
+        "endLine": 350,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 346
+        "startLine": 348
       },
       "variantName": "variable_width_histogram"
     },
@@ -50521,9 +50599,9 @@
         }
       ],
       "specLocation": {
-        "endLine": 357,
+        "endLine": 359,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 350
+        "startLine": 352
       }
     },
     {
@@ -50652,9 +50730,9 @@
       },
       "properties": [],
       "specLocation": {
-        "endLine": 202,
+        "endLine": 204,
         "path": "_types/aggregations/Aggregate.ts",
-        "startLine": 198
+        "startLine": 200
       },
       "variantName": "weighted_avg"
     },
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
index 66752c1d19..43eb69e4ea 100644
--- a/output/typescript/types.ts
+++ b/output/typescript/types.ts
@@ -2498,7 +2498,7 @@ export interface AggregationsAdjacencyMatrixBucketKeys extends AggregationsMulti
 export type AggregationsAdjacencyMatrixBucket = AggregationsAdjacencyMatrixBucketKeys
   & { [property: string]: AggregationsAggregate | long }
 
-export type AggregationsAggregate = AggregationsCardinalityAggregate | AggregationsHdrPercentilesAggregate | AggregationsHdrPercentileRanksAggregate | AggregationsTDigestPercentilesAggregate | AggregationsTDigestPercentileRanksAggregate | AggregationsPercentilesBucketAggregate | AggregationsMedianAbsoluteDeviationAggregate | AggregationsMinAggregate | AggregationsMaxAggregate | AggregationsSumAggregate | AggregationsAvgAggregate | AggregationsWeightedAvgAggregate | AggregationsValueCountAggregate | AggregationsSimpleValueAggregate | AggregationsDerivativeAggregate | AggregationsBucketMetricValueAggregate | AggregationsStatsAggregate | AggregationsStatsBucketAggregate | AggregationsExtendedStatsAggregate | AggregationsExtendedStatsBucketAggregate | AggregationsGeoBoundsAggregate | AggregationsGeoCentroidAggregate | AggregationsHistogramAggregate | AggregationsDateHistogramAggregate | AggregationsAutoDateHistogramAggregate | AggregationsVariableWidthHistogramAggregate | AggregationsStringTermsAggregate | AggregationsLongTermsAggregate | AggregationsDoubleTermsAggregate | AggregationsUnmappedTermsAggregate | AggregationsLongRareTermsAggregate | AggregationsStringRareTermsAggregate | AggregationsUnmappedRareTermsAggregate | AggregationsMultiTermsAggregate | AggregationsMissingAggregate | AggregationsNestedAggregate | AggregationsReverseNestedAggregate | AggregationsGlobalAggregate | AggregationsFilterAggregate | AggregationsSamplerAggregate | AggregationsGeoHashGridAggregate | AggregationsGeoTileGridAggregate | AggregationsRangeAggregate | AggregationsDateRangeAggregate | AggregationsGeoDistanceAggregate | AggregationsIpRangeAggregate | AggregationsFiltersAggregate | AggregationsAdjacencyMatrixAggregate | AggregationsSignificantLongTermsAggregate | AggregationsSignificantStringTermsAggregate | AggregationsUnmappedSignificantTermsAggregate | AggregationsCompositeAggregate | AggregationsScriptedMetricAggregate | AggregationsTopHitsAggregate | AggregationsInferenceAggregate | AggregationsStringStatsAggregate | AggregationsBoxPlotAggregate | AggregationsTopMetricsAggregate | AggregationsTTestAggregate | AggregationsRateAggregate | AggregationsCumulativeCardinalityAggregate | AggregationsMatrixStatsAggregate | AggregationsChildrenAggregate | AggregationsGeoLineAggregate
+export type AggregationsAggregate = AggregationsCardinalityAggregate | AggregationsHdrPercentilesAggregate | AggregationsHdrPercentileRanksAggregate | AggregationsTDigestPercentilesAggregate | AggregationsTDigestPercentileRanksAggregate | AggregationsPercentilesBucketAggregate | AggregationsMedianAbsoluteDeviationAggregate | AggregationsMinAggregate | AggregationsMaxAggregate | AggregationsSumAggregate | AggregationsAvgAggregate | AggregationsWeightedAvgAggregate | AggregationsValueCountAggregate | AggregationsSimpleValueAggregate | AggregationsDerivativeAggregate | AggregationsBucketMetricValueAggregate | AggregationsStatsAggregate | AggregationsStatsBucketAggregate | AggregationsExtendedStatsAggregate | AggregationsExtendedStatsBucketAggregate | AggregationsGeoBoundsAggregate | AggregationsGeoCentroidAggregate | AggregationsHistogramAggregate | AggregationsDateHistogramAggregate | AggregationsAutoDateHistogramAggregate | AggregationsVariableWidthHistogramAggregate | AggregationsStringTermsAggregate | AggregationsLongTermsAggregate | AggregationsDoubleTermsAggregate | AggregationsUnmappedTermsAggregate | AggregationsLongRareTermsAggregate | AggregationsStringRareTermsAggregate | AggregationsUnmappedRareTermsAggregate | AggregationsMultiTermsAggregate | AggregationsMissingAggregate | AggregationsNestedAggregate | AggregationsReverseNestedAggregate | AggregationsGlobalAggregate | AggregationsFilterAggregate | AggregationsChildrenAggregate | AggregationsParentAggregate | AggregationsSamplerAggregate | AggregationsUnmappedSamplerAggregate | AggregationsGeoHashGridAggregate | AggregationsGeoTileGridAggregate | AggregationsRangeAggregate | AggregationsDateRangeAggregate | AggregationsGeoDistanceAggregate | AggregationsIpRangeAggregate | AggregationsFiltersAggregate | AggregationsAdjacencyMatrixAggregate | AggregationsSignificantLongTermsAggregate | AggregationsSignificantStringTermsAggregate | AggregationsUnmappedSignificantTermsAggregate | AggregationsCompositeAggregate | AggregationsScriptedMetricAggregate | AggregationsTopHitsAggregate | AggregationsInferenceAggregate | AggregationsStringStatsAggregate | AggregationsBoxPlotAggregate | AggregationsTopMetricsAggregate | AggregationsTTestAggregate | AggregationsRateAggregate | AggregationsCumulativeCardinalityAggregate | AggregationsMatrixStatsAggregate | AggregationsGeoLineAggregate
 
 export interface AggregationsAggregateBase {
   meta?: Record<string, any>
@@ -2685,13 +2685,10 @@ export interface AggregationsChiSquareHeuristic {
   include_negatives: boolean
 }
 
-export interface AggregationsChildrenAggregate extends AggregationsMultiBucketAggregateBase<AggregationsChildrenAggregateBucket> {
+export interface AggregationsChildrenAggregateKeys extends AggregationsSingleBucketAggregateBase {
 }
-
-export interface AggregationsChildrenAggregateBucketKeys extends AggregationsMultiBucketBase {
-}
-export type AggregationsChildrenAggregateBucket = AggregationsChildrenAggregateBucketKeys
-  & { [property: string]: AggregationsAggregate | long }
+export type AggregationsChildrenAggregate = AggregationsChildrenAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
 
 export interface AggregationsChildrenAggregation extends AggregationsBucketAggregationBase {
   type?: RelationName
@@ -2853,8 +2850,10 @@ export interface AggregationsExtendedStatsBucketAggregation extends Aggregations
 
 export type AggregationsFieldDateMath = DateMath | double
 
-export interface AggregationsFilterAggregate extends AggregationsSingleBucketAggregateBase {
+export interface AggregationsFilterAggregateKeys extends AggregationsSingleBucketAggregateBase {
 }
+export type AggregationsFilterAggregate = AggregationsFilterAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
 
 export interface AggregationsFiltersAggregate extends AggregationsMultiBucketAggregateBase<AggregationsFiltersBucket> {
 }
@@ -2965,8 +2964,10 @@ export interface AggregationsGeoTileGridBucketKeys extends AggregationsMultiBuck
 export type AggregationsGeoTileGridBucket = AggregationsGeoTileGridBucketKeys
   & { [property: string]: AggregationsAggregate | GeoTile | long }
 
-export interface AggregationsGlobalAggregate extends AggregationsSingleBucketAggregateBase {
+export interface AggregationsGlobalAggregateKeys extends AggregationsSingleBucketAggregateBase {
 }
+export type AggregationsGlobalAggregate = AggregationsGlobalAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
 
 export interface AggregationsGlobalAggregation extends AggregationsBucketAggregationBase {
 }
@@ -3184,8 +3185,10 @@ export type AggregationsMinimumInterval = 'second' | 'minute' | 'hour' | 'day' |
 
 export type AggregationsMissing = string | integer | double | boolean
 
-export interface AggregationsMissingAggregate extends AggregationsSingleBucketAggregateBase {
+export interface AggregationsMissingAggregateKeys extends AggregationsSingleBucketAggregateBase {
 }
+export type AggregationsMissingAggregate = AggregationsMissingAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
 
 export interface AggregationsMissingAggregation extends AggregationsBucketAggregationBase {
   field?: Field
@@ -3246,8 +3249,10 @@ export interface AggregationsMutualInformationHeuristic {
   include_negatives?: boolean
 }
 
-export interface AggregationsNestedAggregate extends AggregationsSingleBucketAggregateBase {
+export interface AggregationsNestedAggregateKeys extends AggregationsSingleBucketAggregateBase {
 }
+export type AggregationsNestedAggregate = AggregationsNestedAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
 
 export interface AggregationsNestedAggregation extends AggregationsBucketAggregationBase {
   path?: Field
@@ -3259,6 +3264,11 @@ export interface AggregationsNormalizeAggregation extends AggregationsPipelineAg
 
 export type AggregationsNormalizeMethod = 'rescale_0_1' | 'rescale_0_100' | 'percent_of_sum' | 'mean' | 'z-score' | 'softmax'
 
+export interface AggregationsParentAggregateKeys extends AggregationsSingleBucketAggregateBase {
+}
+export type AggregationsParentAggregate = AggregationsParentAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
+
 export interface AggregationsParentAggregation extends AggregationsBucketAggregationBase {
   type?: RelationName
 }
@@ -3347,15 +3357,19 @@ export interface AggregationsRegressionInferenceOptions {
   num_top_feature_importance_values?: integer
 }
 
-export interface AggregationsReverseNestedAggregate extends AggregationsSingleBucketAggregateBase {
+export interface AggregationsReverseNestedAggregateKeys extends AggregationsSingleBucketAggregateBase {
 }
+export type AggregationsReverseNestedAggregate = AggregationsReverseNestedAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
 
 export interface AggregationsReverseNestedAggregation extends AggregationsBucketAggregationBase {
   path?: Field
 }
 
-export interface AggregationsSamplerAggregate extends AggregationsSingleBucketAggregateBase {
+export interface AggregationsSamplerAggregateKeys extends AggregationsSingleBucketAggregateBase {
 }
+export type AggregationsSamplerAggregate = AggregationsSamplerAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
 
 export interface AggregationsSamplerAggregation extends AggregationsBucketAggregationBase {
   shard_size?: integer
@@ -3659,6 +3673,11 @@ export interface AggregationsTopMetricsValue {
 export interface AggregationsUnmappedRareTermsAggregate extends AggregationsMultiBucketAggregateBase<SpecUtilsVoid> {
 }
 
+export interface AggregationsUnmappedSamplerAggregateKeys extends AggregationsSingleBucketAggregateBase {
+}
+export type AggregationsUnmappedSamplerAggregate = AggregationsUnmappedSamplerAggregateKeys
+  & { [property: string]: AggregationsAggregate | long | Record<string, any> }
+
 export interface AggregationsUnmappedSignificantTermsAggregate extends AggregationsMultiBucketAggregateBase<SpecUtilsVoid> {
 }
 
diff --git a/specification/_types/aggregations/Aggregate.ts b/specification/_types/aggregations/Aggregate.ts
index aabf5b3f20..93ecb82634 100644
--- a/specification/_types/aggregations/Aggregate.ts
+++ b/specification/_types/aggregations/Aggregate.ts
@@ -77,7 +77,10 @@ export type Aggregate =
   | ReverseNestedAggregate
   | GlobalAggregate
   | FilterAggregate
+  | ChildrenAggregate
+  | ParentAggregate
   | SamplerAggregate
+  | UnmappedSamplerAggregate
   // Geo grid
   | GeoHashGridAggregate
   | GeoTileGridAggregate
@@ -105,7 +108,6 @@ export type Aggregate =
   | RateAggregate
   | CumulativeCardinalityAggregate
   | MatrixStatsAggregate
-  | ChildrenAggregate
   | GeoLineAggregate
 
 // Aggregations are defined in the ES code base in two ways:
@@ -454,7 +456,13 @@ export class MultiTermsBucket extends MultiBucketBase {
 
 //----- Single bucket
 
-export class SingleBucketAggregateBase extends AggregateBase {
+/**
+ * Base type for single-bucket aggregation results that can hold sub-aggregations results.
+ */
+export class SingleBucketAggregateBase
+  extends AggregateBase
+  implements AdditionalProperties<AggregateName, Aggregate>
+{
   doc_count: long
 }
 
@@ -476,6 +484,9 @@ export class FilterAggregate extends SingleBucketAggregateBase {}
 /** @variant name=sampler */
 export class SamplerAggregate extends SingleBucketAggregateBase {}
 
+/** @variant name=unmapped_sampler */
+export class UnmappedSamplerAggregate extends SingleBucketAggregateBase {}
+
 //----- Geo grid
 
 /** @variant name=geohash_grid */
@@ -713,14 +724,10 @@ export class MatrixStatsFields {
 //----- Parent join plugin
 
 /** @variant name=children */
-export class ChildrenAggregate extends MultiBucketAggregateBase<ChildrenAggregateBucket> {}
-
-export class ChildrenAggregateBucket extends MultiBucketBase {}
+export class ChildrenAggregate extends SingleBucketAggregateBase {}
 
 /** @variant name=parent */
-export class ParentAggregate extends MultiBucketAggregateBase<ParentAggregateBucket> {}
-
-export class ParentAggregateBucket extends MultiBucketBase {}
+export class ParentAggregate extends SingleBucketAggregateBase {}
 
 //----- Spatial plugin