diff --git a/gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/DataModelWriterExtensions.cs b/gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/DataModelWriterExtensions.cs
index 1575ad935..64a214cc8 100644
--- a/gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/DataModelWriterExtensions.cs
+++ b/gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/DataModelWriterExtensions.cs
@@ -360,9 +360,13 @@ private static void WriteMetadata(this IndentedTextWriter writer, OpenXmlGenerat
             {
                 foreach (var child in containingType.KnownChildren)
                 {
-                    writer.Write("builder.AddChild<");
-                    writer.Write(services.FindClassName(child));
-                    writer.WriteLine(">();");
+                    var className = services.FindClassName(child);
+
+                    writer.Write("builder.AddChild(");
+                    writer.Write(className);
+                    writer.Write(".ElementType, static () => new ");
+                    writer.Write(className);
+                    writer.WriteLine("());");
                 }
             }
 
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_excel.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_excel.g.cs
index 1936584c6..5931ba94b 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_excel.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_excel.g.cs
@@ -147,73 +147,73 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.CommentRowTarget>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.CommentColumnTarget>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.InputValidationType>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MinDropDownWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.SelectionEntry>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DropLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Checked>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarMin>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarMax>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarIncrement>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarPageIncrement>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptLanguage>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptLocation>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Anchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.HorizontalTextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.VerticalTextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.SelectionType>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MultiSelections>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ListBoxCallbackType>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ListItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DropStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaPicture>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptText>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptExtended>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaTextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AcceleratorPrimary>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AcceleratorSecondary>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClipboardFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaMacro>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MoveWithCells>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ResizeWithCells>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Locked>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DefaultSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.PrintObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Disabled>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AutoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AutoLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AutoSizePicture>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.LockText>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.JustifyLastLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.SecretEdit>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DefaultButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.HelpButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.CancelButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DismissButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Visible>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.RowHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ColumnHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MultiLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.VerticalScrollBar>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ValidIds>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Disable3DForListBoxAndDropDown>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Colored>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.Disable3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.FirstButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.HorizontalScrollBar>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.MapOcxControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.CameraObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.RecalculateAlways>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.AutoScaleFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.DdeObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.UIObject>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.CommentRowTarget.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.CommentRowTarget());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.CommentColumnTarget.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.CommentColumnTarget());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.InputValidationType.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.InputValidationType());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.MinDropDownWidth.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.MinDropDownWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.SelectionEntry.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.SelectionEntry());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.DropLines.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.DropLines());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.Checked.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.Checked());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarPosition.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarMin.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarMin());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarMax.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarMax());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarIncrement.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarIncrement());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarPageIncrement.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarPageIncrement());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarWidth.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScrollBarWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptLanguage.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptLanguage());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptLocation.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptLocation());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.Anchor.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.Anchor());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.HorizontalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.HorizontalTextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.VerticalTextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaRange.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaRange());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.SelectionType.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.SelectionType());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.MultiSelections.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.MultiSelections());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ListBoxCallbackType.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ListBoxCallbackType());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ListItem.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ListItem());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.DropStyle.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.DropStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaLink.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaLink());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaPicture.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaPicture());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaGroup.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptText.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptText());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptExtended.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ScriptExtended());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaTextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaTextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.AcceleratorPrimary.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.AcceleratorPrimary());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.AcceleratorSecondary.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.AcceleratorSecondary());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClipboardFormat.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClipboardFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaMacro.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.FormulaMacro());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.MoveWithCells.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.MoveWithCells());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ResizeWithCells.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ResizeWithCells());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.Locked.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.Locked());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.DefaultSize.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.DefaultSize());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.PrintObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.PrintObject());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.Disabled.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.Disabled());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.AutoFill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.AutoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.AutoLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.AutoLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.AutoSizePicture.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.AutoSizePicture());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.LockText.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.LockText());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.JustifyLastLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.JustifyLastLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.SecretEdit.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.SecretEdit());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.DefaultButton.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.DefaultButton());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.HelpButton.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.HelpButton());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.CancelButton.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.CancelButton());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.DismissButton.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.DismissButton());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.Visible.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.Visible());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.RowHidden.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.RowHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ColumnHidden.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ColumnHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.MultiLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.MultiLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.VerticalScrollBar.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.VerticalScrollBar());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ValidIds.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ValidIds());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.Disable3DForListBoxAndDropDown.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.Disable3DForListBoxAndDropDown());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.Colored.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.Colored());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.Disable3D.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.Disable3D());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.FirstButton.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.FirstButton());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.HorizontalScrollBar.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.HorizontalScrollBar());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.MapOcxControl.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.MapOcxControl());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.CameraObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.CameraObject());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.RecalculateAlways.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.RecalculateAlways());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.AutoScaleFont.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.AutoScaleFont());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.DdeObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.DdeObject());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.UIObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.UIObject());
             builder.AddElement<ClientData>()
                 .AddAttribute("ObjectType", a => a.ObjectType, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_office.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_office.g.cs
index 7180e0774..018a2ee59 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_office.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_office.g.cs
@@ -194,17 +194,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ColorMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ColorMenu.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ColorMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
             builder.AddElement<ShapeDefaults>()
                 .AddAttribute("v:ext", a => a.Extension)
                 .AddAttribute("spidmax", a => a.MaxShapeId)
@@ -448,9 +448,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ShapeIdMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.RegroupTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Rules>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ShapeIdMap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ShapeIdMap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.RegroupTable.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.RegroupTable());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Rules.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Rules());
             builder.AddElement<ShapeLayout>()
                 .AddAttribute("v:ext", a => a.Extension);
             builder.Particle = new CompositeParticle.Builder(ParticleType.All, 1, 1)
@@ -907,7 +907,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.RelationTable>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.RelationTable.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.RelationTable());
             builder.AddElement<Diagram>()
                 .AddAttribute("v:ext", a => a.Extension)
                 .AddAttribute("dgmstyle", a => a.Style)
@@ -1905,9 +1905,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.LinkType>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.LockedField>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.FieldCodes>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.LinkType.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.LinkType());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.LockedField.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.LockedField());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.FieldCodes.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.FieldCodes());
             builder.AddElement<OleObject>()
                 .AddAttribute("Type", a => a.Type)
                 .AddAttribute("ProgID", a => a.ProgId)
@@ -2733,7 +2733,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Entry>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Entry.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Entry());
             builder.AddElement<RegroupTable>()
                 .AddAttribute("v:ext", a => a.Extension);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2813,7 +2813,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Rule>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Rule.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Rule());
             builder.AddElement<Rules>()
                 .AddAttribute("v:ext", a => a.Extension);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2973,7 +2973,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Proxy>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Proxy.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Proxy());
             builder.AddElement<Rule>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -3062,7 +3062,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Relation>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Relation.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Relation());
             builder.AddElement<RelationTable>()
                 .AddAttribute("v:ext", a => a.Extension);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_vml.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_vml.g.cs
index 773538c39..974b3c99d 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_vml.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_vml.g.cs
@@ -285,7 +285,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formula.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formula());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Vml.Formula.ElementType, 0, 128)
@@ -350,7 +350,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandle>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandle.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Vml.ShapeHandle.ElementType, 0, 4)
@@ -693,7 +693,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.FillExtendedProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.FillExtendedProperties.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.FillExtendedProperties());
             builder.AddElement<Fill>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("type", a => a.Type)
@@ -1104,11 +1104,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.LeftStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.TopStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.RightStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.BottomStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ColumnStroke>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.LeftStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.LeftStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.TopStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.TopStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.RightStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.RightStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.BottomStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.BottomStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ColumnStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ColumnStroke());
             builder.AddElement<Stroke>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("on", a => a.On)
@@ -1472,7 +1472,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxContent>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxContent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxContent());
             builder.AddElement<TextBox>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -2619,31 +2619,31 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Ink>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.InkAnnotationFlag>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Ink.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Ink());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.InkAnnotationFlag.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.InkAnnotationFlag());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<Shape>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -3469,30 +3469,30 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Complex>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Complex.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Complex());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<Shapetype>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -4069,23 +4069,23 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Diagram>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Arc>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Curve>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Line>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Oval>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.PolyLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Rectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.RoundRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shapetype>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Diagram.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Diagram());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Arc.ElementType, static () => new DocumentFormat.OpenXml.Vml.Arc());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Curve.ElementType, static () => new DocumentFormat.OpenXml.Vml.Curve());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Group.ElementType, static () => new DocumentFormat.OpenXml.Vml.Group());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageFile.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageFile());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Line.ElementType, static () => new DocumentFormat.OpenXml.Vml.Line());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Oval.ElementType, static () => new DocumentFormat.OpenXml.Vml.Oval());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.PolyLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.PolyLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Rectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.Rectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.RoundRectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.RoundRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shape.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shapetype.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shapetype());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<Group>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -4287,7 +4287,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
             builder.AddElement<Background>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -5034,29 +5034,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<Arc>()
                 .AddAttribute("o:spid", a => a.OptionalString)
                 .AddAttribute("o:oned", a => a.Oned)
@@ -5902,29 +5902,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<Curve>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -6818,29 +6818,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<ImageFile>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -7669,29 +7669,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<Line>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -8491,29 +8491,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<Oval>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -9324,30 +9324,30 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Ink>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Ink.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Ink());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<PolyLine>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -10148,29 +10148,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<Rectangle>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
@@ -10970,29 +10970,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<RoundRectangle>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("style", a => a.Style)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_ink_2010_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_ink_2010_main.g.cs
index b32b90379..822fc7315 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_ink_2010_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_ink_2010_main.g.cs
@@ -282,9 +282,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Ink.SourceLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Ink.DestinationLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Ink.ContextNodeProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Ink.SourceLink.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Ink.SourceLink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Ink.DestinationLink.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Ink.DestinationLink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Ink.ContextNodeProperty.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Ink.ContextNodeProperty());
             builder.AddElement<ContextNode>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_01_customui.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_01_customui.g.cs
index f02c99caf..54287dba3 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_01_customui.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_01_customui.g.cs
@@ -1734,8 +1734,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Item.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Item());
             builder.AddElement<UnsizedGallery>()
                 .AddAttribute("description", a => a.Description, aBuilder =>
                 {
@@ -2737,9 +2737,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.VisibleButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.VisibleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.VisibleButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton());
             builder.AddElement<UnsizedSplitButton>()
                 .AddAttribute("enabled", a => a.Enabled)
                 .AddAttribute("getEnabled", a => a.GetEnabled, aBuilder =>
@@ -3176,15 +3176,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton());
             builder.AddElement<UnsizedMenu>()
                 .AddAttribute("itemSize", a => a.ItemSize)
                 .AddAttribute("description", a => a.Description, aBuilder =>
@@ -3994,9 +3994,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.VisibleButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.VisibleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.VisibleButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton());
             builder.AddElement<SplitButtonWithTitle>()
                 .AddAttribute("enabled", a => a.Enabled)
                 .AddAttribute("getEnabled", a => a.GetEnabled, aBuilder =>
@@ -4433,15 +4433,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.SplitButtonWithTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.SplitButtonWithTitle.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.SplitButtonWithTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton());
             builder.AddElement<MenuWithTitle>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -7161,7 +7161,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Item.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Item());
             builder.AddElement<ComboBox>()
                 .AddAttribute("showItemImage", a => a.ShowItemImage)
                 .AddAttribute("getItemCount", a => a.GetItemCount, aBuilder =>
@@ -7759,8 +7759,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Item.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Item());
             builder.AddElement<DropDown>()
                 .AddAttribute("onAction", a => a.OnAction, aBuilder =>
                 {
@@ -8469,8 +8469,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Item.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Item());
             builder.AddElement<Gallery>()
                 .AddAttribute("size", a => a.Size)
                 .AddAttribute("getSize", a => a.GetSize, aBuilder =>
@@ -9050,15 +9050,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton());
             builder.AddElement<Menu>()
                 .AddAttribute("size", a => a.Size)
                 .AddAttribute("getSize", a => a.GetSize, aBuilder =>
@@ -9921,9 +9921,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.VisibleButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.VisibleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.VisibleButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.VisibleToggleButton());
             builder.AddElement<SplitButton>()
                 .AddAttribute("size", a => a.Size)
                 .AddAttribute("getSize", a => a.GetSize, aBuilder =>
@@ -10163,20 +10163,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Button>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ButtonGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ComboBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.DropDown>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.DynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.EditBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Gallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.TextLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Menu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.SplitButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Box.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Button.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Button());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ButtonGroup.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ButtonGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ComboBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ComboBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.DropDown.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.DropDown());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.DynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.DynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.EditBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.EditBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Gallery.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Gallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.TextLabel.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.TextLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Menu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Menu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.SplitButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.SplitButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ToggleButton());
             builder.AddElement<Box>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -10374,13 +10374,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton());
             builder.AddElement<ButtonGroup>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -10522,15 +10522,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedSplitButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton());
             builder.AddElement<MenuRoot>()
                 .AddAttribute("title", a => a.Title, aBuilder =>
                 {
@@ -10649,8 +10649,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.RepurposedCommands>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Ribbon>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.RepurposedCommands.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.RepurposedCommands());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Ribbon.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Ribbon());
             builder.AddElement<CustomUI>()
                 .AddAttribute("onLoad", a => a.OnLoad, aBuilder =>
                 {
@@ -11848,7 +11848,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, 1, 1)
@@ -12151,22 +12151,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Button>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ButtonGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ComboBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.DialogBoxLauncher>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.DropDown>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.DynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.EditBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Gallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.TextLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Menu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.VerticalSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.SplitButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Box.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Button.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Button());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ButtonGroup.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ButtonGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ComboBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ComboBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.DialogBoxLauncher.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.DialogBoxLauncher());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.DropDown.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.DropDown());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.DynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.DynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.EditBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.EditBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Gallery.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Gallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.TextLabel.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.TextLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Menu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Menu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.VerticalSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.VerticalSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.SplitButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.SplitButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ToggleButton());
             builder.AddElement<Group>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -12919,9 +12919,9 @@ protected QatItemsType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.QuickAccessToolbarControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.VerticalSeparator>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.QuickAccessToolbarControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.QuickAccessToolbarControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.VerticalSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.VerticalSeparator());
         }
     }
 
@@ -13119,7 +13119,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Group>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Group.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Group());
             builder.AddElement<Tab>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -13271,7 +13271,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Tab>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Tab.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Tab());
             builder.AddElement<ContextualTabSet>()
                 .AddAttribute("idMso", a => a.IdMso, aBuilder =>
                 {
@@ -13439,15 +13439,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.SplitButtonWithTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedDynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedGallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.MenuWithTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.SplitButtonWithTitle.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.SplitButtonWithTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.UnsizedToggleButton());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 0, 1000)
@@ -13536,8 +13536,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.SharedQatControls>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.DocumentSpecificQuickAccessToolbarControls>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.SharedQatControls.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.SharedQatControls());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.DocumentSpecificQuickAccessToolbarControls.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.DocumentSpecificQuickAccessToolbarControls());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CustomUI.SharedQatControls.ElementType, 0, 1),
@@ -13629,7 +13629,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Tab>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Tab.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Tab());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CustomUI.Tab.ElementType, 1, 100)
@@ -13694,7 +13694,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ContextualTabSet>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ContextualTabSet.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ContextualTabSet());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CustomUI.ContextualTabSet.ElementType, 1, 100)
@@ -13759,7 +13759,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.RepurposedCommand>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.RepurposedCommand.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.RepurposedCommand());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CustomUI.RepurposedCommand.ElementType, 1, 5000)
@@ -13837,10 +13837,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.ContextualTabSets>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.OfficeMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.QuickAccessToolbar>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomUI.Tabs>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.ContextualTabSets.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.ContextualTabSets());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.OfficeMenu.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.OfficeMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.QuickAccessToolbar.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.QuickAccessToolbar());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomUI.Tabs.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomUI.Tabs());
             builder.AddElement<Ribbon>()
                 .AddAttribute("startFromScratch", a => a.StartFromScratch);
             builder.Particle = new CompositeParticle.Builder(ParticleType.All, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_activeX.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_activeX.g.cs
index 42001b98b..dd87f1747 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_activeX.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_activeX.g.cs
@@ -122,7 +122,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.ActiveX.ActiveXObjectProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.ActiveX.ActiveXObjectProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.ActiveX.ActiveXObjectProperty());
             builder.AddElement<ActiveXControlData>()
                 .AddAttribute("ax:classid", a => a.ActiveXControlClassId, aBuilder =>
                 {
@@ -225,8 +225,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.ActiveX.SharedComFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.ActiveX.SharedComPicture>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.ActiveX.SharedComFont.ElementType, static () => new DocumentFormat.OpenXml.Office.ActiveX.SharedComFont());
+            builder.AddChild(DocumentFormat.OpenXml.Office.ActiveX.SharedComPicture.ElementType, static () => new DocumentFormat.OpenXml.Office.ActiveX.SharedComPicture());
             builder.AddElement<ActiveXObjectProperty>()
                 .AddAttribute("ax:name", a => a.Name, aBuilder =>
                 {
@@ -353,7 +353,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.ActiveX.ActiveXObjectProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.ActiveX.ActiveXObjectProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.ActiveX.ActiveXObjectProperty());
             builder.AddElement<SharedComFont>()
                 .AddAttribute("ax:persistence", a => a.Persistence)
                 .AddAttribute("r:id", a => a.Id);
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_coverPageProps.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_coverPageProps.g.cs
index 258a51bce..1145e662b 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_coverPageProps.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_coverPageProps.g.cs
@@ -75,12 +75,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CoverPageProps.PublishDate>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CoverPageProps.DocumentAbstract>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CoverPageProps.CompanyAddress>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CoverPageProps.CompanyPhoneNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CoverPageProps.CompanyFaxNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CoverPageProps.CompanyEmailAddress>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CoverPageProps.PublishDate.ElementType, static () => new DocumentFormat.OpenXml.Office.CoverPageProps.PublishDate());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CoverPageProps.DocumentAbstract.ElementType, static () => new DocumentFormat.OpenXml.Office.CoverPageProps.DocumentAbstract());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CoverPageProps.CompanyAddress.ElementType, static () => new DocumentFormat.OpenXml.Office.CoverPageProps.CompanyAddress());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CoverPageProps.CompanyPhoneNumber.ElementType, static () => new DocumentFormat.OpenXml.Office.CoverPageProps.CompanyPhoneNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CoverPageProps.CompanyFaxNumber.ElementType, static () => new DocumentFormat.OpenXml.Office.CoverPageProps.CompanyFaxNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CoverPageProps.CompanyEmailAddress.ElementType, static () => new DocumentFormat.OpenXml.Office.CoverPageProps.CompanyEmailAddress());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CoverPageProps.PublishDate.ElementType, 1, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_customDocumentInformationPanel.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_customDocumentInformationPanel.g.cs
index 8faf87969..1356b6f19 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_customDocumentInformationPanel.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_customDocumentInformationPanel.g.cs
@@ -72,9 +72,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.CustomPropertyEditor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.DefaultPropertyEditorNamespace>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.ShowOnOpen>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.CustomPropertyEditor.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.CustomPropertyEditor());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.DefaultPropertyEditorNamespace.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.DefaultPropertyEditorNamespace());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.ShowOnOpen.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.ShowOnOpen());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.ShowOnOpen.ElementType, 1, 1),
@@ -343,8 +343,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.PropertyEditorNamespace>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.XsnFileLocation>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.PropertyEditorNamespace.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.PropertyEditorNamespace());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.XsnFileLocation.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.XsnFileLocation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CustomDocumentInformationPanel.PropertyEditorNamespace.ElementType, 1, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_metadata_customXsn.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_metadata_customXsn.g.cs
index 3997bd769..2d643054c 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_metadata_customXsn.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_metadata_customXsn.g.cs
@@ -73,10 +73,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomXsn.XsnLocation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomXsn.CachedView>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomXsn.OpenByDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.CustomXsn.Scope>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomXsn.XsnLocation.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomXsn.XsnLocation());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomXsn.CachedView.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomXsn.CachedView());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomXsn.OpenByDefault.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomXsn.OpenByDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Office.CustomXsn.Scope.ElementType, static () => new DocumentFormat.OpenXml.Office.CustomXsn.Scope());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.CustomXsn.XsnLocation.ElementType, 1, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_metadata_longProperties.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_metadata_longProperties.g.cs
index 2854d6570..2295bef31 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_metadata_longProperties.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2006_metadata_longProperties.g.cs
@@ -70,7 +70,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.LongProperties.LongProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.LongProperties.LongProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.LongProperties.LongProperty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.LongProperties.LongProperty.ElementType, 0, 0)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2009_07_customui.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2009_07_customui.g.cs
index 3944e046e..2de2a9ca2 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2009_07_customui.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2009_07_customui.g.cs
@@ -1752,8 +1752,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Item.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Item());
             builder.AddElement<GalleryRegular>()
                 .AddAttribute("description", a => a.Description, aBuilder =>
                 {
@@ -2773,9 +2773,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton());
             builder.AddElement<SplitButtonRegular>()
                 .AddAttribute("enabled", a => a.Enabled)
                 .AddAttribute("getEnabled", a => a.GetEnabled, aBuilder =>
@@ -3213,15 +3213,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular());
             builder.AddElement<MenuRegular>()
                 .AddAttribute("itemSize", a => a.ItemSize)
                 .AddAttribute("description", a => a.Description, aBuilder =>
@@ -4033,9 +4033,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuWithTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuWithTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuWithTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton());
             builder.AddElement<SplitButtonWithTitle>()
                 .AddAttribute("enabled", a => a.Enabled)
                 .AddAttribute("getEnabled", a => a.GetEnabled, aBuilder =>
@@ -4473,15 +4473,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuWithTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonWithTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuWithTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuWithTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonWithTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonWithTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular());
             builder.AddElement<MenuWithTitle>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -7340,7 +7340,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Item.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Item());
             builder.AddElement<ComboBox>()
                 .AddAttribute("showItemImage", a => a.ShowItemImage)
                 .AddAttribute("getItemCount", a => a.GetItemCount, aBuilder =>
@@ -7939,8 +7939,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Item.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Item());
             builder.AddElement<DropDownRegular>()
                 .AddAttribute("onAction", a => a.OnAction, aBuilder =>
                 {
@@ -8660,8 +8660,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Item.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Item());
             builder.AddElement<Gallery>()
                 .AddAttribute("size", a => a.Size)
                 .AddAttribute("getSize", a => a.GetSize, aBuilder =>
@@ -9243,15 +9243,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular());
             builder.AddElement<Menu>()
                 .AddAttribute("size", a => a.Size)
                 .AddAttribute("getSize", a => a.GetSize, aBuilder =>
@@ -10116,9 +10116,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.VisibleButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.VisibleToggleButton());
             builder.AddElement<SplitButton>()
                 .AddAttribute("size", a => a.Size)
                 .AddAttribute("getSize", a => a.GetSize, aBuilder =>
@@ -10369,20 +10369,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Button>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ComboBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DropDownRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.EditBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Gallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.LabelControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Menu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SplitButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Box.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Button.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Button());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ComboBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ComboBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DropDownRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DropDownRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.EditBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.EditBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Gallery.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Gallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.LabelControl.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.LabelControl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Menu.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Menu());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SplitButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SplitButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButton());
             builder.AddElement<Box>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -10596,14 +10596,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Separator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Separator.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Separator());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular());
             builder.AddElement<ButtonGroup>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -11386,7 +11386,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuGroup());
             builder.AddElement<BackstageSubMenu>()
                 .AddAttribute("description", a => a.Description, aBuilder =>
                 {
@@ -12913,7 +12913,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ItemBackstageItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ItemBackstageItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ItemBackstageItem());
             builder.AddElement<BackstageDropDown>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -13240,7 +13240,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.RadioButtonBackstageItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.RadioButtonBackstageItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.RadioButtonBackstageItem());
             builder.AddElement<RadioGroup>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -13557,7 +13557,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ItemBackstageItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ItemBackstageItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ItemBackstageItem());
             builder.AddElement<BackstageComboBox>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -14285,17 +14285,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup());
             builder.AddElement<GroupBox>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -14469,17 +14469,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup());
             builder.AddElement<LayoutContainer>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -14953,9 +14953,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TopItemsGroupControls>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BottomItemsGroupControls>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.PrimaryItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TopItemsGroupControls.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TopItemsGroupControls());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BottomItemsGroupControls.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BottomItemsGroupControls());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.PrimaryItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.PrimaryItem());
             builder.AddElement<BackstageGroup>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -15260,7 +15260,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroupCategory>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroupCategory.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroupCategory());
             builder.AddElement<TaskGroup>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -15424,15 +15424,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular());
             builder.AddElement<MenuRoot>()
                 .AddAttribute("title", a => a.Title, aBuilder =>
                 {
@@ -15554,10 +15554,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Backstage>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Commands>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ContextMenus>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Ribbon>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Backstage.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Backstage());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Commands.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Commands());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ContextMenus.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ContextMenus());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Ribbon.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Ribbon());
             builder.AddElement<CustomUI>()
                 .AddAttribute("onLoad", a => a.OnLoad, aBuilder =>
                 {
@@ -16835,7 +16835,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, 1, 1, version: FileFormatVersions.Office2010)
@@ -17159,22 +17159,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Button>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ComboBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlClone>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DialogBoxLauncher>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DropDownRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.EditBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Gallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.LabelControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Menu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Separator>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SplitButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Box.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Button.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Button());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ComboBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ComboBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlClone.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlClone());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DialogBoxLauncher.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DialogBoxLauncher());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DropDownRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DropDownRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenu.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.EditBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.EditBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Gallery.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Gallery());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.LabelControl.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.LabelControl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Menu.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Menu());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Separator.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Separator());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SplitButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SplitButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButton());
             builder.AddElement<Group>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -17933,9 +17933,9 @@ protected QatItemsType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneQat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Separator>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneQat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneQat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Separator.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Separator());
         }
     }
 
@@ -18134,7 +18134,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Group>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Group.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Group());
             builder.AddElement<Tab>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -18287,7 +18287,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Tab>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Tab.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Tab());
             builder.AddElement<TabSet>()
                 .AddAttribute("idMso", a => a.IdMso, aBuilder =>
                 {
@@ -18450,8 +18450,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SharedControlsQatItems>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DocumentControlsQatItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SharedControlsQatItems.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SharedControlsQatItems());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DocumentControlsQatItems.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DocumentControlsQatItems());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.CustomUI.SharedControlsQatItems.ElementType, 0, 1, version: FileFormatVersions.Office2010),
@@ -18544,7 +18544,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Tab>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Tab.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Tab());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.CustomUI.Tab.ElementType, 1, 100, version: FileFormatVersions.Office2010)
@@ -18610,7 +18610,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TabSet>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TabSet.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TabSet());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.CustomUI.TabSet.ElementType, 1, 100, version: FileFormatVersions.Office2010)
@@ -18694,15 +18694,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparatorNoTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ControlCloneRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.DynamicMenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GalleryRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparatorNoTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.MenuSeparatorNoTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SplitButtonRegular());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ToggleButtonRegular());
             builder.AddElement<ContextMenu>()
                 .AddAttribute("idMso", a => a.IdMso, aBuilder =>
                 {
@@ -19406,7 +19406,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuGroup());
             builder.AddElement<BackstagePrimaryMenu>()
                 .AddAttribute("screentip", a => a.Screentip, aBuilder =>
                 {
@@ -19608,10 +19608,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuCheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuToggleButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageSubMenu>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuCheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuCheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuToggleButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageMenuToggleButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageSubMenu.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageSubMenu());
             builder.AddElement<BackstageMenuGroup>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -19712,8 +19712,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstagePrimaryMenu>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageRegularButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstagePrimaryMenu.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstagePrimaryMenu());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageRegularButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageRegularButton());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageRegularButton.ElementType, 0, 1, version: FileFormatVersions.Office2010),
@@ -19996,17 +19996,17 @@ protected GroupControlsType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageCheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageComboBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageDropDown());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageEditBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroupButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageLabelControl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.GroupBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ImageControl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.LayoutContainer());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.RadioGroup());
         }
     }
 
@@ -20185,7 +20185,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroupTask>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroupTask.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroupTask());
             builder.AddElement<TaskGroupCategory>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -20762,7 +20762,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroupTask>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroupTask.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroupTask());
             builder.AddElement<TaskFormGroupCategory>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -21084,7 +21084,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup());
             builder.AddElement<TaskFormGroupTask>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -21359,7 +21359,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroupCategory>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroupCategory.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroupCategory());
             builder.AddElement<TaskFormGroup>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -21471,9 +21471,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TaskFormGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroup());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 0, 1)
@@ -21554,8 +21554,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.TaskGroup());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 1000)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1, version: FileFormatVersions.Office2010)
@@ -21859,8 +21859,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroups>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.SimpleGroups>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroups.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageGroups());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.SimpleGroups.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.SimpleGroups());
             builder.AddElement<BackstageTab>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -22359,7 +22359,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Command>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Command.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Command());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.CustomUI.Command.ElementType, 1, 5000, version: FileFormatVersions.Office2010)
@@ -22437,9 +22437,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ContextualTabs>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.QuickAccessToolbar>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.Tabs>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ContextualTabs.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ContextualTabs());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.QuickAccessToolbar.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.QuickAccessToolbar());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.Tabs.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.Tabs());
             builder.AddElement<Ribbon>()
                 .AddAttribute("startFromScratch", a => a.StartFromScratch);
             builder.Particle = new CompositeParticle.Builder(ParticleType.All, 1, 1)
@@ -22569,8 +22569,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageFastCommandButton>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.BackstageTab>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageFastCommandButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageFastCommandButton());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.BackstageTab.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.BackstageTab());
             builder.AddElement<Backstage>()
                 .AddAttribute("onShow", a => a.OnShow, aBuilder =>
                 {
@@ -22649,7 +22649,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.CustomUI.ContextMenu>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.CustomUI.ContextMenu.ElementType, static () => new DocumentFormat.OpenXml.Office2010.CustomUI.ContextMenu());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.CustomUI.ContextMenu.ElementType, 1, 1000, version: FileFormatVersions.Office2010)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2020_mipLabelMetadata.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2020_mipLabelMetadata.g.cs
index 325a3b5a0..2fb9b338d 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2020_mipLabelMetadata.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2020_mipLabelMetadata.g.cs
@@ -72,8 +72,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationLabel>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationLabel.ElementType, static () => new DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationLabel());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationLabel.ElementType, 0, 0, version: FileFormatVersions.Office2021),
@@ -393,7 +393,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.MipLabelMetaData.ClassificationExtension.ElementType, 0, 0, version: FileFormatVersions.Office2021)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2007_8_2_chart.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2007_8_2_chart.g.cs
index 0e1e4878b..053da302f 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2007_8_2_chart.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2007_8_2_chart.g.cs
@@ -76,11 +76,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneCategories>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZonesVisible>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneCategories.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneCategories());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneData.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZonesVisible.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZonesVisible());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Drawing.Charts.DropZoneFilter.ElementType, 0, 1, version: FileFormatVersions.Office2010),
@@ -216,8 +216,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.InSketchMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.ShowSketchButton>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.InSketchMode.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.InSketchMode());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.ShowSketchButton.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.ShowSketchButton());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Drawing.Charts.InSketchMode.ElementType, 0, 1, version: FileFormatVersions.Office2010),
@@ -310,7 +310,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.ShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.ShapeProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Drawing.Charts.ShapeProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010)
@@ -460,21 +460,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2008_diagram.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2008_diagram.g.cs
index 0431b17d2..5b245aca2 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2008_diagram.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2008_diagram.g.cs
@@ -72,7 +72,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.ShapeTree>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.ShapeTree.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.ShapeTree());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Drawing.ShapeTree.ElementType, 1, 1, version: FileFormatVersions.Office2010)
@@ -291,9 +291,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -423,8 +423,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeLocks());
             builder.AddElement<NonVisualDrawingShapeProperties>()
                 .AddAttribute("txBox", a => a.TextBox);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -520,8 +520,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingShapeProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -638,21 +638,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -771,10 +771,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, 1, 1),
@@ -897,9 +897,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, 1, 1),
@@ -1024,8 +1024,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -1122,7 +1122,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -1195,8 +1195,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, 0, 1),
@@ -1290,8 +1290,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.NonVisualGroupDrawingShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.NonVisualGroupDrawingShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.NonVisualGroupDrawingShapeProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Drawing.NonVisualDrawingProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -1404,17 +1404,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TransformGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TransformGroup.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TransformGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<GroupShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -1535,12 +1535,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.TextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Transform2D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.ShapeNonVisualProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.TextBody.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.TextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Transform2D());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.ShapeNonVisualProperties.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.ShapeNonVisualProperties());
             builder.AddElement<Shape>()
                 .AddAttribute("modelId", a => a.ModelId, aBuilder =>
                 {
@@ -1853,11 +1853,11 @@ protected GroupShapeType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.GroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.GroupShapeNonVisualProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Shape>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.GroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.GroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.GroupShapeNonVisualProperties.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.GroupShapeNonVisualProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Shape.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Shape());
         }
 
         /// <summary>
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_chartDrawing.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_chartDrawing.g.cs
index 9ec35909d..e56e5379a 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_chartDrawing.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_chartDrawing.g.cs
@@ -99,10 +99,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.Transform2D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ApplicationNonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualContentPartProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.Transform2D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ApplicationNonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualContentPartProperties());
             builder.AddElement<ContentPart>()
                 .AddAttribute("r:id", a => a.RelationshipId, aBuilder =>
                 {
@@ -284,9 +284,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -416,8 +416,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks());
             builder.AddElement<NonVisualInkContentPartProperties>()
                 .AddAttribute("isComment", a => a.IsComment);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -513,8 +513,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualInkContentPartProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualInkContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualInkContentPartProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -692,8 +692,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -790,7 +790,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_diagram.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_diagram.g.cs
index 62e7b24ed..9b2f0b0df 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_diagram.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_diagram.g.cs
@@ -124,9 +124,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_main.g.cs
index c1cf3bbf6..0a7040cb1 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_main.g.cs
@@ -243,9 +243,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Transform2D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.NonVisualContentPartProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Transform2D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.NonVisualContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.NonVisualContentPartProperties());
             builder.AddElement<GvmlContentPart>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -409,12 +409,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -620,18 +620,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomDash>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HeadEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TailEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineJoinBevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Miter>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Round>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetDash>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomDash.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomDash());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HeadEnd.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HeadEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TailEnd.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TailEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineJoinBevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineJoinBevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Miter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Miter());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Round.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Round());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetDash.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetDash());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<HiddenLineProperties>()
                 .AddAttribute("w", a => a.Width, aBuilder =>
                 {
@@ -744,8 +744,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -847,10 +847,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Backdrop>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Camera>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LightRig>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Backdrop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Backdrop());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Camera.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Camera());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LightRig.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LightRig());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Camera.ElementType, 1, 1),
@@ -1015,11 +1015,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BevelTop>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BevelBottom>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtrusionColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ContourColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BevelTop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BevelTop());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BevelBottom.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BevelBottom());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtrusionColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtrusionColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ContourColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ContourColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<HiddenShape3D>()
                 .AddAttribute("z", a => a.Z, aBuilder =>
                 {
@@ -1171,7 +1171,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ImageLayer>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ImageLayer.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ImageLayer());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Drawing.ImageLayer.ElementType, 1, 1, version: FileFormatVersions.Office2010)
@@ -1324,7 +1324,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -1496,7 +1496,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList());
             builder.AddElement<ContentPartLocks>()
                 .AddAttribute("noGrp", a => a.NoGrouping)
                 .AddAttribute("noSelect", a => a.NoSelection)
@@ -3117,8 +3117,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.BackgroundMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ForegroundMark>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.BackgroundMark.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.BackgroundMark());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ForegroundMark.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ForegroundMark());
             builder.AddElement<BackgroundRemoval>()
                 .AddAttribute("t", a => a.MarqueeTop, aBuilder =>
                 {
@@ -3440,33 +3440,33 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.BackgroundRemoval>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticBlur>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.BrightnessContrast>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCement>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticChalkSketch>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ColorTemperature>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCrisscrossEtching>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCutout>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticFilmGrain>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlass>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlowDiffused>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlowEdges>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticLightScreen>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticLineDrawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticMarker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticMosaicBubbles>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPaintBrush>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPaintStrokes>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPastelsSmooth>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPencilGrayscale>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPencilSketch>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPhotocopy>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPlasticWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.SharpenSoften>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticTexturizer>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ArtisticWatercolorSponge>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.BackgroundRemoval.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.BackgroundRemoval());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticBlur.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticBlur());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.BrightnessContrast.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.BrightnessContrast());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCement.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCement());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticChalkSketch.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticChalkSketch());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ColorTemperature.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ColorTemperature());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCrisscrossEtching.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCrisscrossEtching());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCutout.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticCutout());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticFilmGrain.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticFilmGrain());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlass.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlass());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlowDiffused.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlowDiffused());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlowEdges.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticGlowEdges());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticLightScreen.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticLightScreen());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticLineDrawing.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticLineDrawing());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticMarker.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticMarker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticMosaicBubbles.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticMosaicBubbles());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPaintBrush.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPaintBrush());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPaintStrokes.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPaintStrokes());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPastelsSmooth.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPastelsSmooth());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPencilGrayscale.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPencilGrayscale());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPencilSketch.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPencilSketch());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPhotocopy.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPhotocopy());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPlasticWrap.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticPlasticWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.SharpenSoften.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.SharpenSoften());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticTexturizer.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticTexturizer());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ArtisticWatercolorSponge.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ArtisticWatercolorSponge());
             builder.AddElement<ImageEffect>()
                 .AddAttribute("visible", a => a.Visible);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -3924,7 +3924,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ImageEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ImageEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ImageEffect());
             builder.AddElement<ImageLayer>()
                 .AddAttribute("r:embed", a => a.Embed);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -4044,9 +4044,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -4176,8 +4176,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks());
             builder.AddElement<NonVisualInkContentPartProperties>()
                 .AddAttribute("isComment", a => a.IsComment);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -4273,8 +4273,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.NonVisualInkContentPartProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.NonVisualInkContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.NonVisualInkContentPartProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Drawing.NonVisualDrawingProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -4398,8 +4398,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_picture.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_picture.g.cs
index 3cadd359f..ea40f5cea 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_picture.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_picture.g.cs
@@ -75,10 +75,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, 1, 1),
@@ -199,7 +199,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_slicer.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_slicer.g.cs
index 86108f2d9..ee0488213 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_slicer.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_slicer.g.cs
@@ -82,7 +82,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Slicer.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Slicer.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Slicer.OfficeArtExtensionList());
             builder.AddElement<Slicer>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -166,7 +166,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chart.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chart.g.cs
index 4e873728e..1930955f7 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chart.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chart.g.cs
@@ -75,9 +75,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.FormatId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PivotTableName>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.FormatId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.FormatId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PivotTableName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PivotTableName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PivotTableName.ElementType, 1, 1),
@@ -265,21 +265,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -396,8 +396,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ManualLayout>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ManualLayout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ManualLayout());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ManualLayout.ElementType, 0, 1),
@@ -490,7 +490,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -569,7 +569,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -648,7 +648,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -727,7 +727,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -806,7 +806,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.AxisDataSourceType>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.AxisDataSourceType.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.AxisDataSourceType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.AxisDataSourceType.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -885,7 +885,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.AreaChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.AreaChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.AreaChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.AreaChartSeries.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -964,7 +964,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.BarChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.BarChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.BarChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.BarChartSeries.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -1043,7 +1043,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.BubbleChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.BubbleChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.BubbleChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.BubbleChartSeries.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -1122,7 +1122,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.LineChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.LineChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.LineChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.LineChartSeries.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -1201,7 +1201,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.PieChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.PieChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.PieChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.PieChartSeries.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -1280,7 +1280,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.RadarChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.RadarChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.RadarChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.RadarChartSeries.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -1359,7 +1359,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ScatterChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ScatterChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ScatterChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ScatterChartSeries.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -1438,7 +1438,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.SurfaceChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SurfaceChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.SurfaceChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SurfaceChartSeries.ElementType, 1, 1, version: FileFormatVersions.Office2013)
@@ -1518,8 +1518,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRangeChache>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRangeChache.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRangeChache());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.Formula());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Formula.ElementType, 1, 1, version: FileFormatVersions.Office2013),
@@ -1612,7 +1612,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterException>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterException.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterException());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterException.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -1678,7 +1678,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTableEntry>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTableEntry.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTableEntry());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTableEntry.ElementType, 0, 0, version: FileFormatVersions.Office2013)
@@ -1970,9 +1970,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RichText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringLiteral>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RichText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RichText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringLiteral.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringLiteral());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -2082,7 +2082,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, 0, 1)
@@ -2297,11 +2297,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringLiteral>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringLiteral.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringLiteral());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -2452,20 +2452,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -2641,20 +2641,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Smooth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Smooth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Smooth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -2831,19 +2831,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.XValues>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Smooth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.YValues>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.XValues.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.XValues());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Smooth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Smooth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.YValues.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.YValues());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3003,18 +3003,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3172,17 +3172,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Explosion>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Explosion.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Explosion());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3358,21 +3358,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.XValues>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bubble3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.YValues>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.XValues.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.XValues());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bubble3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bubble3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.YValues.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.YValues());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3548,17 +3548,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3728,15 +3728,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bubble3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bubble3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bubble3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -4075,9 +4075,9 @@ protected StringDataType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PointCount>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PointCount());
         }
 
         /// <summary>
@@ -4198,10 +4198,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Size>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Symbol>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Size.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Size());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Symbol.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Symbol());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Symbol.ElementType, 0, 1),
@@ -4337,22 +4337,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowPercent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Separator>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowValue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowPercent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowPercent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Separator.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Separator());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, 1, 1),
@@ -4467,13 +4467,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.InvertIfNegativeBoolean>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.Bubble3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.Explosion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.InvertIfNegativeBoolean.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.InvertIfNegativeBoolean());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Bubble3D.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.Bubble3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabel.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Marker.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Explosion.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.Explosion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.SequenceOfReferences.ElementType, 1, 1, version: FileFormatVersions.Office2013),
@@ -4638,9 +4638,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTableCache>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.TextFieldGuid>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTableCache.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTableCache());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.TextFieldGuid.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.TextFieldGuid());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.Formula());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Drawing.Chart.TextFieldGuid.ElementType, 1, 1, version: FileFormatVersions.Office2013),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chartStyle.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chartStyle.g.cs
index 663cd7a7c..40240c7b8 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chartStyle.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_chartStyle.g.cs
@@ -99,14 +99,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ColorStyleVariation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ColorStyleVariation.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ColorStyleVariation());
             builder.AddElement<ColorStyle>()
                 .AddAttribute("meth", a => a.Method, aBuilder =>
                 {
@@ -268,38 +268,38 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.MarkerLayoutProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.AxisTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.CategoryAxis>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ChartArea>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataLabelCallout>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPoint3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointMarker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointWireframe>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataTableStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DownBar>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DropLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ErrorBar>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.Floor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.GridlineMajor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.GridlineMinor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.HiLoLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LeaderLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LegendStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.PlotArea>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.PlotArea3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.SeriesAxis>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.SeriesLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TitleStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TrendlineStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TrendlineLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.UpBar>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ValueAxis>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.Wall>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.MarkerLayoutProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.MarkerLayoutProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.AxisTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.AxisTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.CategoryAxis.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.CategoryAxis());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ChartArea.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ChartArea());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataLabel.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataLabelCallout.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataLabelCallout());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPoint3D.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPoint3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointLine.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointLine());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointMarker.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointMarker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointWireframe.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataPointWireframe());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataTableStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DataTableStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DownBar.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DownBar());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DropLine.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.DropLine());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ErrorBar.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ErrorBar());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.Floor.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.Floor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.GridlineMajor.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.GridlineMajor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.GridlineMinor.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.GridlineMinor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.HiLoLine.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.HiLoLine());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LeaderLine.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LeaderLine());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LegendStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LegendStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.PlotArea.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.PlotArea());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.PlotArea3D.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.PlotArea3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.SeriesAxis.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.SeriesAxis());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.SeriesLine.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.SeriesLine());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TitleStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TitleStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TrendlineStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TrendlineStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TrendlineLabel.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TrendlineLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.UpBar.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.UpBar());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ValueAxis.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ValueAxis());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.Wall.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.Wall());
             builder.AddElement<ChartStyle>()
                 .AddAttribute("id", a => a.Id);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -872,34 +872,34 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Complement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gray>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InverseGamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Inverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Red>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Green>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Complement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Complement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gray.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gray());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InverseGamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InverseGamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Inverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Inverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Red.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Red());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Green.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Green());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shade.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueModulation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -998,7 +998,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -1107,34 +1107,34 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Complement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gray>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InverseGamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Inverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Red>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Green>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Complement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Complement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gray.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gray());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InverseGamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InverseGamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Inverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Inverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Red.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Red());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Green.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Green());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shade.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueModulation());
             builder.AddElement<StyleColor>()
                 .AddAttribute("val", a => a.Val, aBuilder =>
                 {
@@ -1516,13 +1516,13 @@ public ListValue<StringValue>? Modifiers
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.StyleColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.StyleColor.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.StyleColor());
             builder.AddElement<StyleReference>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -1658,13 +1658,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.StyleColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.StyleColor.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.StyleColor());
             builder.AddElement<FontReference>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -1773,21 +1773,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -2114,28 +2114,28 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RightToLeft>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Highlight>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnMouseOver>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LatinFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EastAsianFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ComplexScriptFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SymbolFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.UnderlineFillText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.UnderlineFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.UnderlineFollowsText>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RightToLeft.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RightToLeft());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Highlight.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Highlight());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnMouseOver.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnMouseOver());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LatinFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LatinFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EastAsianFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EastAsianFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ComplexScriptFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ComplexScriptFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SymbolFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SymbolFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.UnderlineFillText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.UnderlineFillText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.UnderlineFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.UnderlineFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.UnderlineFollowsText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.UnderlineFollowsText());
             builder.AddElement<TextCharacterPropertiesType>()
                 .AddAttribute("kumimoji", a => a.Kumimoji)
                 .AddAttribute("lang", a => a.Language)
@@ -2494,14 +2494,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FlatText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetTextWarp>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoAutoFit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NormalAutoFit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeAutoFit>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FlatText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FlatText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetTextWarp.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetTextWarp());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoAutoFit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NormalAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NormalAutoFit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeAutoFit());
             builder.AddElement<TextBodyProperties>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("spcFirstLastPara", a => a.UseParagraphSpacing)
@@ -5962,15 +5962,15 @@ public ListValue<StringValue>? Modifiers
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TextBodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TextCharacterPropertiesType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.EffectReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LineWidthScale>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TextBodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TextBodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TextCharacterPropertiesType.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.TextCharacterPropertiesType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.EffectReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LineWidthScale.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.LineWidthScale());
             builder.AddElement<StyleEntry>()
                 .AddAttribute("mods", a => a.Modifiers);
         }
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_timeslicer.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_timeslicer.g.cs
index 5e84b1472..372ba9f6d 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_timeslicer.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2012_timeslicer.g.cs
@@ -82,7 +82,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.TimeSlicer.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.TimeSlicer.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.TimeSlicer.OfficeArtExtensionList());
             builder.AddElement<TimeSlicer>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -166,7 +166,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2013_main_command.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2013_main_command.g.cs
index 944bb9238..9c9e01855 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2013_main_command.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2013_main_command.g.cs
@@ -522,8 +522,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -1297,16 +1297,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NonVisualDrawingProps>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NonVisualGroupDrawingShapeProps>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ConnectorMoniker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicFrameMoniker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeMoniker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.InkMoniker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.PictureMoniker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ShapeMoniker>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NonVisualDrawingProps.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NonVisualDrawingProps());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NonVisualGroupDrawingShapeProps.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NonVisualGroupDrawingShapeProps());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ConnectorMoniker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ConnectorMoniker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicFrameMoniker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicFrameMoniker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeMoniker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeMoniker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.InkMoniker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.InkMoniker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.PictureMoniker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.PictureMoniker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ShapeMoniker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ShapeMoniker());
             builder.AddElement<GroupCommand>()
                 .AddAttribute("verId", a => a.VerId)
                 .AddAttribute("preventRegroup", a => a.PreventRegroup)
@@ -2920,23 +2920,23 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AutoNumberedBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PictureBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletColorText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletSizeText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletSizePercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletSizePoints>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletFontText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.DefaultRunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CharacterBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SpaceBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SpaceAfter>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TabStopList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AutoNumberedBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AutoNumberedBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PictureBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PictureBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletColorText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletColorText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletSizeText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletSizeText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletSizePercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletSizePercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletSizePoints.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletSizePoints());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletFontText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletFontText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.DefaultRunProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.DefaultRunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CharacterBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CharacterBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineSpacing.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SpaceBefore.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SpaceBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SpaceAfter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SpaceAfter());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TabStopList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TabStopList());
             builder.AddElement<TextParagraphPropertiesType>()
                 .AddAttribute("marL", a => a.LeftMargin, aBuilder =>
                 {
@@ -3308,14 +3308,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FlatText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetTextWarp>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoAutoFit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NormalAutoFit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeAutoFit>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FlatText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FlatText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetTextWarp.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetTextWarp());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoAutoFit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NormalAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NormalAutoFit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeAutoFit());
             builder.AddElement<TextBodyProperties>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("spcFirstLastPara", a => a.UseParagraphSpacing)
@@ -3701,21 +3701,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -4733,15 +4733,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.XfrmEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.GeomEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.FillEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.LnEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.Scene3dEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.Sp3dEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ExtLstEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.BwModeEmpty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.XfrmEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.XfrmEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.GeomEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.GeomEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.FillEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.FillEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.LnEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.LnEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.Scene3dEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.Scene3dEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.Sp3dEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.Sp3dEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ExtLstEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ExtLstEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.BwModeEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.BwModeEmpty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Command.XfrmEmpty.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -5188,12 +5188,12 @@ public UInt32Value? Index
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<StyleMatrixReferenceType>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -5350,12 +5350,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<FontReference>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -5519,10 +5519,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.LnRefStyleMatrixReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.FillRefStyleMatrixReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectRefStyleMatrixReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.LnRefStyleMatrixReference.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.LnRefStyleMatrixReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.FillRefStyleMatrixReference.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.FillRefStyleMatrixReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectRefStyleMatrixReference.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectRefStyleMatrixReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Command.LnRefStyleMatrixReference.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -5756,10 +5756,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SourceRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Stretch>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tile>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SourceRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SourceRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Stretch.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Stretch());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tile());
             builder.AddElement<BlipFillProperties>()
                 .AddAttribute("dpi", a => a.Dpi)
                 .AddAttribute("rotWithShape", a => a.RotateWithShape);
@@ -5999,10 +5999,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.SrcRectEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.FillModeEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.DpiEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.RotWithShapeEmpty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.SrcRectEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.SrcRectEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.FillModeEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.FillModeEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.DpiEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.DpiEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.RotWithShapeEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.RotWithShapeEmpty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Command.SrcRectEmpty.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -6252,17 +6252,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TransformGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TransformGroup.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TransformGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<GroupShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -6373,12 +6373,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.XfrmEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.FillEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.Scene3dEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ExtLstEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.BwModeEmpty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.XfrmEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.XfrmEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.FillEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.FillEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.EffectEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.Scene3dEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.Scene3dEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ExtLstEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ExtLstEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.BwModeEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.BwModeEmpty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Command.XfrmEmpty.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -6579,9 +6579,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProps>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -6701,8 +6701,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, 0, 1),
@@ -7111,8 +7111,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.StCxnConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.EndCxnConnection>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.StCxnConnection.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.StCxnConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.EndCxnConnection.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.EndCxnConnection());
             builder.AddElement<ModifyNonVisualConnectorProps>()
                 .AddAttribute("noGrp", a => a.NoGrp)
                 .AddAttribute("noSelect", a => a.NoSelect)
@@ -7227,18 +7227,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.StCxnEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.EndCxnEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoGrpEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoSelectEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoRotEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeAspectEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoMoveEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoResizeEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoEditPointsEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoAdjustHandlesEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeArrowheadsEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeShapeTypeEmpty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.StCxnEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.StCxnEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.EndCxnEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.EndCxnEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoGrpEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoGrpEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoSelectEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoSelectEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoRotEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoRotEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeAspectEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeAspectEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoMoveEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoMoveEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoResizeEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoResizeEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoEditPointsEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoEditPointsEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoAdjustHandlesEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoAdjustHandlesEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeArrowheadsEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeArrowheadsEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeShapeTypeEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.NoChangeShapeTypeEmpty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Command.StCxnEmpty.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -7703,7 +7703,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.LfPrEmpty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.LfPrEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.LfPrEmpty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Command.LfPrEmpty.ElementType, 0, 1, version: FileFormatVersions.Office2016)
@@ -7984,18 +7984,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomDash>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HeadEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TailEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineJoinBevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Miter>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Round>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetDash>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomDash.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomDash());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HeadEnd.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HeadEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TailEnd.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TailEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineJoinBevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineJoinBevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Miter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Miter());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Round.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Round());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetDash.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetDash());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<LinePropertiesType>()
                 .AddAttribute("w", a => a.Width, aBuilder =>
                 {
@@ -8458,7 +8458,7 @@ public StringValue? SndName
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.SndDataImgData>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.SndDataImgData.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.SndDataImgData());
             builder.AddElement<OpenXmlHyperlinkPropsElement>()
                 .AddAttribute("source", a => a.Source)
                 .AddAttribute("action", a => a.Action)
@@ -8539,8 +8539,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkClickHyperlinkProps>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkHoverHyperlinkProps>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkClickHyperlinkProps.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkClickHyperlinkProps());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkHoverHyperlinkProps.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkHoverHyperlinkProps());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkClickHyperlinkProps.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -8634,8 +8634,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkClickEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkHoverEmpty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkClickEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkClickEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkHoverEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkHoverEmpty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Command.HlinkClickEmpty.ElementType, 0, 1, version: FileFormatVersions.Office2016),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chart.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chart.g.cs
index e09753221..9d59219b2 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chart.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chart.g.cs
@@ -97,21 +97,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -376,10 +376,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Size>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Symbol>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Size.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Size());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Symbol.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Symbol());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Symbol.ElementType, 0, 1),
@@ -515,22 +515,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowPercent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Separator>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowValue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowPercent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowPercent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Separator.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Separator());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, 1, 1),
@@ -639,7 +639,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterException>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterException.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterException());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterException.ElementType, 1, 0, version: FileFormatVersions.Office2016)
@@ -705,7 +705,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.BooleanFalse>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.BooleanFalse.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.BooleanFalse());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Charts.BooleanFalse.ElementType, 0, 1, version: FileFormatVersions.Office2016)
@@ -784,7 +784,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMapEntry>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMapEntry.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMapEntry());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMapEntry.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -959,13 +959,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.InvertIfNegativeBoolean>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.Bubble3DBoolean>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.DLbl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UnsignedIntegerType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.InvertIfNegativeBoolean.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.InvertIfNegativeBoolean());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.Bubble3DBoolean.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.Bubble3DBoolean());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.DLbl.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.DLbl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UnsignedIntegerType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UnsignedIntegerType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, 1, 1, version: FileFormatVersions.Office2016),
@@ -1131,10 +1131,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumericPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PointCount>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.FormatCode>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumericPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumericPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PointCount());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.FormatCode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.FormatCode());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.FormatCode.ElementType, 0, 1),
@@ -1229,7 +1229,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.NumberDataType>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.NumberDataType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.NumberDataType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Charts.NumberDataType.ElementType, 1, 1, version: FileFormatVersions.Office2016)
@@ -1310,9 +1310,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PointCount>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PointCount());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, 0, 1),
@@ -1393,7 +1393,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.StringDataType>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.StringDataType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.StringDataType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Charts.StringDataType.ElementType, 1, 1, version: FileFormatVersions.Office2016)
@@ -1474,9 +1474,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Level>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PointCount>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Level.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Level());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PointCount());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, 0, 1),
@@ -1557,7 +1557,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.MultiLvlStrData>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.MultiLvlStrData.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.MultiLvlStrData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Charts.MultiLvlStrData.ElementType, 1, 1, version: FileFormatVersions.Office2016)
@@ -1771,8 +1771,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueID>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.XsdunsignedInt>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueID());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.XsdunsignedInt.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.XsdunsignedInt());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.Charts.XsdunsignedInt.ElementType, 1, 1, version: FileFormatVersions.Office2016),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chart_ac.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chart_ac.g.cs
index 38976b630..c81c71e4e 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chart_ac.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chart_ac.g.cs
@@ -74,9 +74,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Level>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PointCount>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Level.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Level());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PointCount());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, 0, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chartex.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chartex.g.cs
index 3fdb2989a..6c9999dd6 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chartex.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2014_chartex.g.cs
@@ -80,14 +80,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ColorMappingType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Chart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FormatOverrides>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PrintSettings>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ColorMappingType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ColorMappingType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Chart.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Chart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartData.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FormatOverrides.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FormatOverrides());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PrintSettings.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PrintSettings());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartData.ElementType, 1, 1, version: FileFormatVersions.Office2016),
@@ -709,12 +709,12 @@ protected OpenXmlSolidColorFillPropertiesElement(string outerXml) : base(outerXm
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
         }
 
         /// <summary>
@@ -1069,7 +1069,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartStringValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartStringValue.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartStringValue());
             builder.AddElement<StringLevel>()
                 .AddAttribute("ptCount", a => a.PtCount, aBuilder =>
                 {
@@ -1230,7 +1230,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericValue.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericValue());
             builder.AddElement<NumericLevel>()
                 .AddAttribute("ptCount", a => a.PtCount, aBuilder =>
                 {
@@ -1315,9 +1315,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NfFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericLevel>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NfFormula.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NfFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericLevel.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericLevel());
             builder.AddElement<NumericDimension>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -1406,9 +1406,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NfFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.StringLevel>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NfFormula.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NfFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.StringLevel.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.StringLevel());
             builder.AddElement<StringDimension>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -1485,7 +1485,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Extension2>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Extension2.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Extension2());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Extension2.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -1629,9 +1629,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericDimension>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.StringDimension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericDimension.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumericDimension());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.StringDimension.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.StringDimension());
             builder.AddElement<Data>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -2104,8 +2104,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.VXsdstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.VXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.VXsdstring());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2314,9 +2314,9 @@ protected TextBodyType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
         }
 
         /// <summary>
@@ -2402,8 +2402,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.RichTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TextData>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.RichTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.RichTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TextData.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TextData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -2523,21 +2523,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -2656,10 +2656,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -2937,10 +2937,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -3072,8 +3072,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisUnitsLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisUnitsLabel.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisUnitsLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
             builder.AddElement<AxisUnits>()
                 .AddAttribute("unit", a => a.Unit);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -3301,8 +3301,8 @@ protected OpenXmlGridlinesElement(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
         }
 
         /// <summary>
@@ -3525,7 +3525,7 @@ public EnumValue<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TickMark
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
             builder.AddElement<OpenXmlTickMarksElement>()
                 .AddAttribute("type", a => a.Type);
         }
@@ -3599,7 +3599,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, 0, 1, version: FileFormatVersions.Office2016)
@@ -3929,7 +3929,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Address>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Address.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Address());
             builder.AddElement<GeoLocation>()
                 .AddAttribute("latitude", a => a.Latitude)
                 .AddAttribute("longitude", a => a.Longitude)
@@ -4109,7 +4109,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocation>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocation.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocation.ElementType, 0, 1, version: FileFormatVersions.Office2016)
@@ -4189,8 +4189,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQuery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocations>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQuery.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQuery());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocations.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocations());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQuery.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -4357,7 +4357,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoPolygon>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoPolygon.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoPolygon());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoPolygon.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -4423,7 +4423,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.CopyrightXsdstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.CopyrightXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.CopyrightXsdstring());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.CopyrightXsdstring.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -4610,8 +4610,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Copyrights>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoPolygons>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Copyrights.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Copyrights());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoPolygons.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoPolygons());
             builder.AddElement<GeoData>()
                 .AddAttribute("entityName", a => a.EntityName, aBuilder =>
                 {
@@ -4730,8 +4730,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQuery>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoData.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQuery.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQuery());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQuery.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -4959,8 +4959,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointQuery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQuery>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointQuery.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointQuery());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQuery.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQuery());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointQuery.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -5098,7 +5098,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EntityType>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EntityType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EntityType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EntityType.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -5248,7 +5248,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildTypes>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildTypes.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildTypes());
             builder.AddElement<GeoChildEntitiesQuery>()
                 .AddAttribute("entityId", a => a.EntityId, aBuilder =>
                 {
@@ -5332,7 +5332,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoHierarchyEntity>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoHierarchyEntity.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoHierarchyEntity());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoHierarchyEntity.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -5399,8 +5399,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntities>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQuery>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntities.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntities());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQuery.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQuery());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQuery.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -5647,9 +5647,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoEntity>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQuery>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntity>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoEntity.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoEntity());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQuery.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQuery());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntity.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntity());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQuery.ElementType, 1, 1, version: FileFormatVersions.Office2016),
@@ -5756,7 +5756,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQueryResult>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQueryResult.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQueryResult());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQueryResult.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -5822,7 +5822,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQueryResult>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQueryResult.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQueryResult());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQueryResult.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -5888,7 +5888,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQueryResult>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQueryResult.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQueryResult());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQueryResult.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -5954,7 +5954,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQueryResult>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQueryResult.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQueryResult());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQueryResult.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -6020,7 +6020,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQueryResult>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQueryResult.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQueryResult());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQueryResult.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -6135,11 +6135,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQueryResults>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQueryResults>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQueryResults>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQueryResults>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQueryResults>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQueryResults.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoChildEntitiesQueryResults());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQueryResults.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataEntityQueryResults());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQueryResults.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoDataPointToEntityQueryResults());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQueryResults.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQueryResults());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQueryResults.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoParentEntitiesQueryResults());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoLocationQueryResults.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -6285,8 +6285,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Clear>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Xsdbase64Binary>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Clear.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Clear());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Xsdbase64Binary.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Xsdbase64Binary());
             builder.AddElement<GeoCache>()
                 .AddAttribute("provider", a => a.Provider, aBuilder =>
                 {
@@ -6599,8 +6599,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Xsddouble>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.BinCountXsdunsignedInt>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Xsddouble.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Xsddouble());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.BinCountXsdunsignedInt.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.BinCountXsdunsignedInt());
             builder.AddElement<Binning>()
                 .AddAttribute("intervalClosed", a => a.IntervalClosed)
                 .AddAttribute("underflow", a => a.Underflow, aBuilder =>
@@ -6761,7 +6761,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoCache.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.GeoCache());
             builder.AddElement<Geography>()
                 .AddAttribute("projectionType", a => a.ProjectionType)
                 .AddAttribute("viewedRegionType", a => a.ViewedRegionType)
@@ -6899,7 +6899,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.UnsignedIntegerType>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.UnsignedIntegerType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.UnsignedIntegerType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.UnsignedIntegerType.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -7226,9 +7226,9 @@ protected OpenXmlValueColorEndPositionElement(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtremeValueColorPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberColorPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PercentageColorPosition>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtremeValueColorPosition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtremeValueColorPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberColorPosition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberColorPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PercentageColorPosition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PercentageColorPosition());
         }
 
         /// <summary>
@@ -7327,8 +7327,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberColorPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PercentageColorPosition>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberColorPosition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberColorPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PercentageColorPosition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PercentageColorPosition());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberColorPosition.ElementType, 1, 1, version: FileFormatVersions.Office2016),
@@ -7511,12 +7511,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelVisibilities>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeparatorXsdstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelVisibilities.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelVisibilities());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeparatorXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeparatorXsdstring());
             builder.AddElement<DataLabel>()
                 .AddAttribute("idx", a => a.Idx, aBuilder =>
                 {
@@ -7719,9 +7719,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinColorSolidColorFillProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MidColorSolidColorFillProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MaxColorSolidColorFillProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinColorSolidColorFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinColorSolidColorFillProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MidColorSolidColorFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MidColorSolidColorFillProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MaxColorSolidColorFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MaxColorSolidColorFillProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinColorSolidColorFillProperties.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -7840,9 +7840,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinValueColorEndPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MaxValueColorEndPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColorMiddlePosition>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinValueColorEndPosition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinValueColorEndPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MaxValueColorEndPosition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MaxValueColorEndPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColorMiddlePosition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColorMiddlePosition());
             builder.AddElement<ValueColorPositions>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -7965,8 +7965,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
             builder.AddElement<DataPoint>()
                 .AddAttribute("idx", a => a.Idx, aBuilder =>
                 {
@@ -8081,14 +8081,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelVisibilities>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeparatorXsdstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabel.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelHidden.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelVisibilities.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabelVisibilities());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeparatorXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeparatorXsdstring());
             builder.AddElement<DataLabels>()
                 .AddAttribute("pos", a => a.Pos);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -8282,15 +8282,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Aggregation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Binning>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Geography>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ParentLabelLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.RegionLabelLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeriesElementVisibilities>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Statistics>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Subtotals>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Aggregation.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Aggregation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Binning.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Binning());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Geography.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Geography());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ParentLabelLayout.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ParentLabelLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.RegionLabelLayout.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.RegionLabelLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeriesElementVisibilities.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeriesElementVisibilities());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Statistics.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Statistics());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Subtotals.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Subtotals());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ParentLabelLayout.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -8452,8 +8452,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -8605,16 +8605,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataId>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeriesLayoutProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColorPositions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataId.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataId());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeriesLayoutProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.SeriesLayoutProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColorPositions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColorPositions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColors.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueColors());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisId());
             builder.AddElement<Series>()
                 .AddAttribute("layoutId", a => a.LayoutId, aBuilder =>
                 {
@@ -8752,9 +8752,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotSurface>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Series>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotSurface.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotSurface());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Series.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Series());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotSurface.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -8867,19 +8867,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisUnits>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.CategoryAxisScaling>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MajorGridlinesGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinorGridlinesGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TickLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MajorTickMarksTickMarks>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinorTickMarksTickMarks>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueAxisScaling>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisUnits.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.AxisUnits());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.CategoryAxisScaling.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.CategoryAxisScaling());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MajorGridlinesGridlines.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MajorGridlinesGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinorGridlinesGridlines.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinorGridlinesGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.NumberFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TickLabels.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TickLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MajorTickMarksTickMarks.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MajorTickMarksTickMarks());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinorTickMarksTickMarks.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.MinorTickMarksTickMarks());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueAxisScaling.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ValueAxisScaling());
             builder.AddElement<Axis>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -8999,10 +8999,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Text());
             builder.AddElement<ChartTitle>()
                 .AddAttribute("pos", a => a.Pos)
                 .AddAttribute("align", a => a.Align)
@@ -9130,10 +9130,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Axis>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotAreaRegion>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Axis.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Axis());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotAreaRegion.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotAreaRegion());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotAreaRegion.ElementType, 1, 1, version: FileFormatVersions.Office2016),
@@ -9247,9 +9247,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.TxPrTextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
             builder.AddElement<Legend>()
                 .AddAttribute("pos", a => a.Pos)
                 .AddAttribute("align", a => a.Align)
@@ -9371,8 +9371,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
             builder.AddElement<FormatOverride>()
                 .AddAttribute("idx", a => a.Idx, aBuilder =>
                 {
@@ -9505,12 +9505,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.OddHeaderXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.OddFooterXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EvenHeaderXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EvenFooterXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FirstHeaderXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FirstFooterXsdstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.OddHeaderXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.OddHeaderXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.OddFooterXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.OddFooterXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EvenHeaderXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EvenHeaderXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EvenFooterXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.EvenFooterXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FirstHeaderXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FirstHeaderXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FirstFooterXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FirstFooterXsdstring());
             builder.AddElement<HeaderFooter>()
                 .AddAttribute("alignWithMargins", a => a.AlignWithMargins)
                 .AddAttribute("differentOddEven", a => a.DifferentOddEven)
@@ -9912,9 +9912,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Data>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExternalData>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Data.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Data());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExternalData.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExternalData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExternalData.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -9998,10 +9998,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Legend>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotArea>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Legend.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.Legend());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotArea.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PlotArea());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.ChartTitle.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -10242,7 +10242,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<ColorMappingType>()
                 .AddAttribute("bg1", a => a.Background1, aBuilder =>
                 {
@@ -10382,7 +10382,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FormatOverride>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FormatOverride.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FormatOverride());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.FormatOverride.ElementType, 0, 0, version: FileFormatVersions.Office2016)
@@ -10450,9 +10450,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PageMargins>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PageSetup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PageMargins.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PageMargins());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PageSetup.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.PageSetup());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Drawing.ChartDrawing.HeaderFooter.ElementType, 0, 1, version: FileFormatVersions.Office2016),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2016_11_diagram.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2016_11_diagram.g.cs
index 5f4533609..92ec954bc 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2016_11_diagram.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2016_11_diagram.g.cs
@@ -72,7 +72,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfo());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfo.ElementType, 0, 0, version: FileFormatVersions.Office2019)
@@ -161,10 +161,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AutoNumberedBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PictureBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CharacterBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoBullet>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AutoNumberedBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AutoNumberedBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PictureBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PictureBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CharacterBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CharacterBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoBullet());
             builder.AddElement<DiagramAutoBullet>()
                 .AddAttribute("prefix", a => a.AutoBulletPrefix)
                 .AddAttribute("leadZeros", a => a.LeadZeros);
@@ -311,7 +311,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.DiagramAutoBullet>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.DiagramAutoBullet.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.DiagramAutoBullet());
             builder.AddElement<NumberDiagramInfo>()
                 .AddAttribute("lvl", a => a.Lvl, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2016_12_diagram.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2016_12_diagram.g.cs
index 65f0de861..eed3ec52d 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2016_12_diagram.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2016_12_diagram.g.cs
@@ -96,21 +96,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -236,17 +236,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties.ElementType, 0, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2017_03_chart.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2017_03_chart.g.cs
index 5ef85d966..cef6382b7 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2017_03_chart.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2017_03_chart.g.cs
@@ -71,7 +71,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Chart.BooleanFalse>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Chart.BooleanFalse.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Chart.BooleanFalse());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Chart.BooleanFalse.ElementType, 0, 1, version: FileFormatVersions.Office2019)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2017_model3d.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2017_model3d.g.cs
index 583eaade8..c8fc81226 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2017_model3d.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2017_model3d.g.cs
@@ -112,19 +112,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PictureAttributionSourceURL>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.AmbientLight>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.DirectionalLight>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DCamera>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DRaster>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DTransform>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ObjectViewport>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PointLight>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SpotLight>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.UnknownLight>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.WindowViewport>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PictureAttributionSourceURL.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PictureAttributionSourceURL());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.AmbientLight.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.AmbientLight());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.DirectionalLight.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.DirectionalLight());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DCamera.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DCamera());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DRaster.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DRaster());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DTransform.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DTransform());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ObjectViewport.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ObjectViewport());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PointLight.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PointLight());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SpotLight.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SpotLight());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.UnknownLight.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.UnknownLight());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.WindowViewport.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.WindowViewport());
             builder.AddElement<Model3D>()
                 .AddAttribute("r:embed", a => a.Embed)
                 .AddAttribute("r:link", a => a.Link);
@@ -783,9 +783,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SxRatio>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SyRatio>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SzRatio>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SxRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SxRatio());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SyRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SyRatio());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SzRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SzRatio());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SxRatio.ElementType, 1, 1, version: FileFormatVersions.Office2019),
@@ -957,7 +957,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -1164,8 +1164,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SzPositiveRatio>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SzPositiveRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SzPositiveRatio());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.SzPositiveRatio.ElementType, 1, 1, version: FileFormatVersions.Office2019),
@@ -1268,7 +1268,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
             builder.AddElement<PerspectiveProjection>()
                 .AddAttribute("fov", a => a.Fov, aBuilder =>
                 {
@@ -1406,24 +1406,24 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaBiLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaCeiling>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaFloor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaInverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulationEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulationFixed>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaReplace>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BiLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blur>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorReplacement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Duotone>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillOverlay>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Grayscale>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hsl>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TintEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaBiLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaBiLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaCeiling.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaCeiling());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaFloor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaFloor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaInverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaInverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulationEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulationEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulationFixed.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulationFixed());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaReplace.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaReplace());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BiLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BiLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blur.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blur());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorChange.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorChange());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorReplacement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorReplacement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Duotone.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Duotone());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillOverlay.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillOverlay());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Grayscale.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Grayscale());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hsl.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hsl());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TintEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TintEffect());
             builder.AddElement<Blip>()
                 .AddAttribute("r:embed", a => a.Embed)
                 .AddAttribute("r:link", a => a.Link)
@@ -1521,12 +1521,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -1692,8 +1692,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.EmbeddedAnimation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.PosterFrame>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.EmbeddedAnimation.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.EmbeddedAnimation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.PosterFrame.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.PosterFrame());
             builder.AddElement<Model3DExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -1791,21 +1791,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -1926,12 +1926,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.UpVector3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OrthographicProjection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PerspectiveProjection>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.UpVector3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.UpVector3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OrthographicProjection.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OrthographicProjection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PerspectiveProjection.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PerspectiveProjection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D.ElementType, 1, 1, version: FileFormatVersions.Office2019),
@@ -2049,12 +2049,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PreTransVector3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PostTransVector3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.MeterPerModelUnitPositiveRatio>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Rotate3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Scale3D>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PreTransVector3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PreTransVector3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PostTransVector3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PostTransVector3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.MeterPerModelUnitPositiveRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.MeterPerModelUnitPositiveRatio());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Rotate3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Rotate3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Scale3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Scale3D());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.MeterPerModelUnitPositiveRatio.ElementType, 0, 1, version: FileFormatVersions.Office2019),
@@ -2272,7 +2272,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Blip>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Blip.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Blip());
             builder.AddElement<Model3DRaster>()
                 .AddAttribute("rName", a => a.RName, aBuilder =>
                 {
@@ -2360,7 +2360,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.Model3DExtension.ElementType, 0, 0, version: FileFormatVersions.Office2019)
@@ -2436,7 +2436,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
             builder.AddElement<ObjectViewport>()
                 .AddAttribute("viewportSz", a => a.ViewportSz, aBuilder =>
                 {
@@ -2521,7 +2521,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, 0, 1, version: FileFormatVersions.Office2019)
@@ -2612,9 +2612,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IlluminancePositiveRatio>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IlluminancePositiveRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IlluminancePositiveRatio());
             builder.AddElement<AmbientLight>()
                 .AddAttribute("enabled", a => a.Enabled);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2746,10 +2746,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IntensityPositiveRatio>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IntensityPositiveRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IntensityPositiveRatio());
             builder.AddElement<PointLight>()
                 .AddAttribute("enabled", a => a.Enabled)
                 .AddAttribute("rad", a => a.Rad, aBuilder =>
@@ -2911,11 +2911,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IntensityPositiveRatio>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IntensityPositiveRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IntensityPositiveRatio());
             builder.AddElement<SpotLight>()
                 .AddAttribute("enabled", a => a.Enabled)
                 .AddAttribute("rad", a => a.Rad, aBuilder =>
@@ -3086,11 +3086,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IlluminancePositiveRatio>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.ColorType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.PosPoint3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.LookAtPoint3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IlluminancePositiveRatio.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Model3D.IlluminancePositiveRatio());
             builder.AddElement<DirectionalLight>()
                 .AddAttribute("enabled", a => a.Enabled)
                 .AddAttribute("angularRad", a => a.AngularRad, aBuilder =>
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_animation.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_animation.g.cs
index 0cb3246ad..3a2ab2b08 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_animation.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_animation.g.cs
@@ -142,7 +142,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Animation.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Animation.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Animation.OfficeArtExtensionList());
             builder.AddElement<AnimationProperties>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("length", a => a.Length, aBuilder =>
@@ -239,7 +239,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_animation_model3d.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_animation_model3d.g.cs
index bc32e4f6f..476511492 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_animation_model3d.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_animation_model3d.g.cs
@@ -84,8 +84,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.AnimationProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.AnimationProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Animation.Model3D.AnimationProperties());
             builder.AddElement<EmbeddedAnimation>()
                 .AddAttribute("animId", a => a.AnimId, aBuilder =>
                 {
@@ -313,7 +313,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Animation.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Animation.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Animation.OfficeArtExtensionList());
             builder.AddElement<AnimationProperties>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("length", a => a.Length, aBuilder =>
@@ -410,7 +410,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_sketchyshapes.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_sketchyshapes.g.cs
index 080bf3051..d7c5dbf93 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_sketchyshapes.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2018_sketchyshapes.g.cs
@@ -236,11 +236,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchTypeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchSeed>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchTypeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchTypeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchSeed.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchSeed());
             builder.AddElement<LineSketchStyleProperties>()
                 .AddAttribute("sd", a => a.Sd);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -321,10 +321,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchNoneEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchCurvedEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchFreehandEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchScribbleEmpty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchNoneEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchNoneEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchCurvedEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchCurvedEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchFreehandEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchFreehandEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchScribbleEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchScribbleEmpty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1, version: FileFormatVersions.Office2021)
@@ -496,7 +496,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_livefeed.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_livefeed.g.cs
index 3b10427e7..f91b6c42f 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_livefeed.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_livefeed.g.cs
@@ -72,7 +72,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, 0, 1, version: FileFormatVersions.Office2021)
@@ -151,7 +151,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, 0, 1, version: FileFormatVersions.Office2021)
@@ -230,7 +230,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, 0, 1, version: FileFormatVersions.Office2021)
@@ -309,7 +309,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, 0, 1, version: FileFormatVersions.Office2021)
@@ -389,8 +389,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedBackgroundProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedBackgroundProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedBackgroundProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedBackgroundProperties.ElementType, 0, 1, version: FileFormatVersions.Office2021),
@@ -483,7 +483,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -559,11 +559,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundBlurProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundCustomProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundNormalProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundRemovedProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundBlurProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundBlurProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundCustomProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundCustomProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundNormalProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundNormalProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundRemovedProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.BackgroundRemovedProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1, version: FileFormatVersions.Office2021)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_oembed.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_oembed.g.cs
index c2518eac0..9b802711f 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_oembed.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_oembed.g.cs
@@ -92,7 +92,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OfficeArtExtensionList());
             builder.AddElement<OEmbedShared>()
                 .AddAttribute("srcUrl", a => a.SrcUrl, aBuilder =>
                 {
@@ -180,7 +180,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_scriptlink.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_scriptlink.g.cs
index 58dba57ab..088ede783 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_scriptlink.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2021_scriptlink.g.cs
@@ -82,7 +82,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.OfficeArtExtensionList());
             builder.AddElement<ScriptLink>()
                 .AddAttribute("val", a => a.Val);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -163,7 +163,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_excel_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_excel_2006_main.g.cs
index 9aaad7008..065805f9f 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_excel_2006_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_excel_2006_main.g.cs
@@ -97,33 +97,33 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.AutoFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Columns>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatting>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataConsolidate>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OleObjects>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowBreaks>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageMargins>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageSetup>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PrintOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetData>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetDimension>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortState>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.AutoFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.AutoFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Columns.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Columns());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatting.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatting());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataConsolidate.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataConsolidate());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OleObjects.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OleObjects());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowBreaks.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowBreaks());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageMargins.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageMargins());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageSetup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageSetup());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PrintOptions.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PrintOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Picture.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetData.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetData());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetDimension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetDimension());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetProtection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortState.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortState());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.SheetProperties.ElementType, 0, 1),
@@ -298,8 +298,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.ColumnSortMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.RowSortMap>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.ColumnSortMap.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.ColumnSortMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.RowSortMap.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.RowSortMap());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Excel.RowSortMap.ElementType, 0, 1),
@@ -531,7 +531,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.RowSortMapItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.RowSortMapItem.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.RowSortMapItem());
             builder.AddElement<RowSortMap>()
                 .AddAttribute("ref", a => a.Ref, aBuilder =>
                 {
@@ -625,7 +625,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.ColumnSortMapItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.ColumnSortMapItem.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.ColumnSortMapItem());
             builder.AddElement<ColumnSortMap>()
                 .AddAttribute("ref", a => a.Ref, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_excel_2010_spreadsheetDrawing.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_excel_2010_spreadsheetDrawing.g.cs
index 81d816b5b..b35915d8e 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_excel_2010_spreadsheetDrawing.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_excel_2010_spreadsheetDrawing.g.cs
@@ -99,10 +99,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.Transform2D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.ApplicationNonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.ExcelNonVisualContentPartShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.Transform2D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.ApplicationNonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.ExcelNonVisualContentPartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.ExcelNonVisualContentPartShapeProperties());
             builder.AddElement<ContentPart>()
                 .AddAttribute("r:id", a => a.RelationshipId, aBuilder =>
                 {
@@ -284,9 +284,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -416,8 +416,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks());
             builder.AddElement<NonVisualInkContentPartProperties>()
                 .AddAttribute("isComment", a => a.IsComment);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -513,8 +513,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.NonVisualInkContentPartProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.NonVisualInkContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.NonVisualInkContentPartProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.Drawing.NonVisualDrawingProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -692,8 +692,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -790,7 +790,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2010_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2010_main.g.cs
index 6f1a6d10a..30e0bd9f3 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2010_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2010_main.g.cs
@@ -77,9 +77,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualInkContentPartProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ApplicationNonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualInkContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualInkContentPartProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ApplicationNonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualDrawingProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -217,8 +217,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -325,7 +325,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.AddElement<ExtensionListModify>()
                 .AddAttribute("mod", a => a.Modify);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -428,10 +428,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.MediaBookmarkList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.MediaFade>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.MediaTrim>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.MediaBookmarkList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.MediaBookmarkList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.MediaFade.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.MediaFade());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.MediaTrim.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.MediaTrim());
             builder.AddElement<Media>()
                 .AddAttribute("r:embed", a => a.Embed)
                 .AddAttribute("r:link", a => a.Link);
@@ -1548,7 +1548,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SectionOld>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionOld.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SectionOld());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionOld.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -1614,7 +1614,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.Section>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.Section.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.Section());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.PowerPoint.Section.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -1728,12 +1728,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -2026,7 +2026,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.TracePointList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.TracePointList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.TracePointList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.PowerPoint.TracePointList.ElementType, 0, 0, version: FileFormatVersions.Office2010)
@@ -2201,13 +2201,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.PlayEventRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.StopEventRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.PauseEventRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ResumeEventRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SeekEventRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.NullEventRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.TriggerEventRecord>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.PlayEventRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.PlayEventRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.StopEventRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.StopEventRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.PauseEventRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.PauseEventRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ResumeEventRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ResumeEventRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SeekEventRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SeekEventRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.NullEventRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.NullEventRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.TriggerEventRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.TriggerEventRecord());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
@@ -2425,9 +2425,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -2557,8 +2557,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks());
             builder.AddElement<NonVisualInkContentPartProperties>()
                 .AddAttribute("isComment", a => a.IsComment);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2680,14 +2680,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AudioFromCD>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AudioFromFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.WaveAudioFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.QuickTimeFromFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.VideoFromFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomerDataList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PlaceholderShape>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AudioFromCD.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AudioFromCD());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AudioFromFile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AudioFromFile());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.WaveAudioFile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.WaveAudioFile());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.QuickTimeFromFile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.QuickTimeFromFile());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.VideoFromFile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.VideoFromFile());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomerDataList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomerDataList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PlaceholderShape.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PlaceholderShape());
             builder.AddElement<ApplicationNonVisualDrawingProperties>()
                 .AddAttribute("isPhoto", a => a.IsPhoto)
                 .AddAttribute("userDrawn", a => a.UserDrawn);
@@ -2946,7 +2946,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.MediaBookmark>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.MediaBookmark.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.MediaBookmark());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.PowerPoint.MediaBookmark.ElementType, 0, 0, version: FileFormatVersions.Office2010)
@@ -3012,7 +3012,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -3114,7 +3114,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList());
             builder.AddElement<SectionOld>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("slideIdLst", a => a.SlideIdList, aBuilder =>
@@ -3250,7 +3250,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SectionSlideIdListEntry>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionSlideIdListEntry.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SectionSlideIdListEntry());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionSlideIdListEntry.ElementType, 0, 0, version: FileFormatVersions.Office2010)
@@ -3337,8 +3337,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SectionSlideIdList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionSlideIdList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SectionSlideIdList());
             builder.AddElement<Section>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("id", a => a.Id, aBuilder =>
@@ -3513,7 +3513,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.TracePoint>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.TracePoint.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.TracePoint());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.PowerPoint.TracePoint.ElementType, 0, 0, version: FileFormatVersions.Office2010)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2012_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2012_main.g.cs
index 43aec0120..75ac59fd7 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2012_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2012_main.g.cs
@@ -211,7 +211,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ParentCommentIdentifier>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ParentCommentIdentifier.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ParentCommentIdentifier());
             builder.AddElement<ThreadingInfo>()
                 .AddAttribute("timeZoneBias", a => a.TimeZoneBias);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -425,8 +425,8 @@ protected ExtendedGuideList(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ExtendedGuide>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ExtendedGuide.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ExtendedGuide());
         }
     }
 
@@ -590,12 +590,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -750,7 +750,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -873,8 +873,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ColorType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ColorType.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ColorType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ExtensionList());
             builder.AddElement<ExtendedGuide>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2012_roamingSettings.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2012_roamingSettings.g.cs
index 2e3b738c9..1ce9f609b 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2012_roamingSettings.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2012_roamingSettings.g.cs
@@ -160,8 +160,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.Roaming.Key>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.Roaming.Value>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.Roaming.Key.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.Roaming.Key());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.Roaming.Value.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.Roaming.Value());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.PowerPoint.Roaming.Key.ElementType, 1, 1, version: FileFormatVersions.Office2013),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2013_main_command.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2013_main_command.g.cs
index 42fb5b041..684478e1e 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2013_main_command.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2013_main_command.g.cs
@@ -603,8 +603,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.DocumentMoniker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMoniker>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.DocumentMoniker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.DocumentMoniker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMoniker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMoniker());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Presentation.Command.DocumentMoniker.ElementType, 1, 1, version: FileFormatVersions.Office2016),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2017_3_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2017_3_main.g.cs
index 029f8561b..76910f292 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2017_3_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2017_3_main.g.cs
@@ -81,7 +81,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Presentation.TrackList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Presentation.TrackList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Presentation.TrackList());
             builder.AddElement<TracksInfo>()
                 .AddAttribute("displayLoc", a => a.DisplayLoc, aBuilder =>
                 {
@@ -265,7 +265,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Presentation.Track>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Presentation.Track.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Presentation.Track());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Presentation.Track.ElementType, 0, 0, version: FileFormatVersions.Office2019)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2018_8_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2018_8_main.g.cs
index 36b7591a8..8d0006cab 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2018_8_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2018_8_main.g.cs
@@ -108,9 +108,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, 1, 1),
@@ -204,7 +204,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommentPropertiesExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -276,7 +276,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Author>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Author.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Author());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Author.ElementType, 0, 0, version: FileFormatVersions.Office2021)
@@ -373,7 +373,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Comment>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Comment.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Comment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Comment.ElementType, 0, 0, version: FileFormatVersions.Office2021)
@@ -519,7 +519,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -641,7 +641,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.ExtensionList());
             builder.AddElement<Author>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -800,8 +800,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.TextBodyType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.TextBodyType.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.TextBodyType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtensionList());
             builder.AddElement<CommentReply>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -983,7 +983,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentReply>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentReply.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentReply());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentReply.ElementType, 0, 0, version: FileFormatVersions.Office2021)
@@ -1182,20 +1182,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Point2DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.TextBodyType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMkLstDrawingElementMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TableCellMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TableColumnMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TableRowMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TextCharRangeMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentReplyList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentUnknownAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.MainMasterMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideLayoutMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Point2DType.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.Point2DType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.TextBodyType.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.TextBodyType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMkLstDrawingElementMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMkLstDrawingElementMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TableCellMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TableCellMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TableColumnMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TableColumnMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TableRowMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TableRowMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TextCharRangeMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TextCharRangeMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentPropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentReplyList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentReplyList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentUnknownAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentUnknownAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.MainMasterMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.MainMasterMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideLayoutMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideLayoutMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList());
             builder.AddElement<Comment>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2019_12_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2019_12_main.g.cs
index 36fbbf336..f95e38b47 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2019_12_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2019_12_main.g.cs
@@ -83,8 +83,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistory>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistory.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistory());
             builder.AddElement<TaskHistoryDetails>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -230,7 +230,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -438,8 +438,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.CommentAnchor>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.CommentAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.CommentAnchor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.CommentAnchor.ElementType, 1, 1, version: FileFormatVersions.Office2021),
@@ -924,19 +924,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AddEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.UnasgnAllEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AtrbtnTaskAssignUnassignUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AsgnTaskAssignUnassignUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.UnAsgnTaskAssignUnassignUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskPriorityRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskProgressEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskScheduleEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskTitleEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskUndo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskUnknownRecord>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AddEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AddEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.UnasgnAllEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.UnasgnAllEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AtrbtnTaskAssignUnassignUser.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AtrbtnTaskAssignUnassignUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AsgnTaskAssignUnassignUser.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.AsgnTaskAssignUnassignUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.UnAsgnTaskAssignUnassignUser.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.UnAsgnTaskAssignUnassignUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskPriorityRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskPriorityRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskProgressEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskProgressEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskScheduleEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskScheduleEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskTitleEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskTitleEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskUndo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskUndo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskUnknownRecord.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskUnknownRecord());
             builder.AddElement<TaskHistoryEvent>()
                 .AddAttribute("time", a => a.Time, aBuilder =>
                 {
@@ -1053,7 +1053,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistoryEvent>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistoryEvent.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistoryEvent());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistoryEvent.ElementType, 0, 0, version: FileFormatVersions.Office2021)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2019_9_main_command.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2019_9_main_command.g.cs
index 8f230b048..67fb4877b 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2019_9_main_command.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2019_9_main_command.g.cs
@@ -73,8 +73,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentV2Moniker>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentV2Moniker.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentV2Moniker());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList.ElementType, 1, 1, version: FileFormatVersions.Office2016),
@@ -168,8 +168,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentReplyV2Moniker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentV2MonikerList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentReplyV2Moniker.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentReplyV2Moniker());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentV2MonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentV2MonikerList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2019.Main.Command.CommentV2MonikerList.ElementType, 1, 1, version: FileFormatVersions.Microsoft365),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2020_02_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2020_02_main.g.cs
index d2581f9bd..28d644ada 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2020_02_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2020_02_main.g.cs
@@ -72,7 +72,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.DesignerTag>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.DesignerTag.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.DesignerTag());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.DesignerTag.ElementType, 0, 0, version: FileFormatVersions.Office2021)
@@ -149,8 +149,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.DesignerTagList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.DesignerTagList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Designer.DesignerTagList());
             builder.AddElement<DesignerDrawingProps>()
                 .AddAttribute("edtDesignElem", a => a.EdtDesignElem);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -305,7 +305,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2021_06_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2021_06_main.g.cs
index 2801914af..aa2ceb404 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2021_06_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2021_06_main.g.cs
@@ -83,8 +83,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskHistory>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskHistory.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskHistory());
             builder.AddElement<TaskHistoryDetails>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -230,7 +230,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -438,8 +438,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.CommentAnchor>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.CommentAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.CommentAnchor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.CommentAnchor.ElementType, 1, 1, version: FileFormatVersions.Microsoft365),
@@ -924,19 +924,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AddEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.UnasgnAllEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AtrbtnTaskAssignUnassignUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AsgnTaskAssignUnassignUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.UnAsgnTaskAssignUnassignUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskPriorityRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskProgressEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskScheduleEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskTitleEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskUndo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskUnknownRecord>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AddEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AddEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.UnasgnAllEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.UnasgnAllEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AtrbtnTaskAssignUnassignUser.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AtrbtnTaskAssignUnassignUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AsgnTaskAssignUnassignUser.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.AsgnTaskAssignUnassignUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.UnAsgnTaskAssignUnassignUser.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.UnAsgnTaskAssignUnassignUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskPriorityRecord.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskPriorityRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskProgressEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskProgressEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskScheduleEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskScheduleEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskTitleEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskTitleEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskUndo.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskUndo());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskUnknownRecord.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskUnknownRecord());
             builder.AddElement<TaskHistoryEvent>()
                 .AddAttribute("time", a => a.Time, aBuilder =>
                 {
@@ -1053,7 +1053,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskHistoryEvent>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskHistoryEvent.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskHistoryEvent());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main.TaskHistoryEvent.ElementType, 0, 0, version: FileFormatVersions.Microsoft365)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2022_03_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2022_03_main.g.cs
index 0ed5e227a..e9772f8b6 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2022_03_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2022_03_main.g.cs
@@ -72,7 +72,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reaction>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reaction.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reaction());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reaction.ElementType, 0, 0, version: FileFormatVersions.Microsoft365)
@@ -138,7 +138,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -230,7 +230,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.ExtensionList());
             builder.AddElement<ReactionInstance>()
                 .AddAttribute("time", a => a.Time, aBuilder =>
                 {
@@ -329,7 +329,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.ReactionInstance>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.ReactionInstance.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.ReactionInstance());
             builder.AddElement<Reaction>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2022_08_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2022_08_main.g.cs
index d8ada328b..2d8f61265 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2022_08_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2022_08_main.g.cs
@@ -93,8 +93,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskHistory>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskHistory.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskHistory());
             builder.AddElement<TaskDetails>()
                 .AddAttribute("deleted", a => a.Deleted)
                 .AddAttribute("inactive", a => a.Inactive);
@@ -237,7 +237,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -414,8 +414,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.CommentAnchor>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.CommentAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.CommentAnchor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.CommentAnchor.ElementType, 1, 1, version: FileFormatVersions.Microsoft365),
@@ -851,17 +851,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AddEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.UnasgnAllEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AtrbtnTaskAssignUnassignUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AsgnTaskAssignUnassignUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskProgressEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskScheduleEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskTitleEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskUndo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskUnknownRecord>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AddEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AddEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.UnasgnAllEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.UnasgnAllEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AtrbtnTaskAssignUnassignUser.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AtrbtnTaskAssignUnassignUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AsgnTaskAssignUnassignUser.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.AsgnTaskAssignUnassignUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskProgressEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskProgressEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskScheduleEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskScheduleEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskTitleEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskTitleEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskUndo.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskUndo());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskUnknownRecord.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskUnknownRecord());
             builder.AddElement<TaskHistoryEvent>()
                 .AddAttribute("time", a => a.Time, aBuilder =>
                 {
@@ -976,7 +976,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskHistoryEvent>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskHistoryEvent.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskHistoryEvent());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskHistoryEvent.ElementType, 0, 0, version: FileFormatVersions.Microsoft365)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2023_02_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2023_02_main.g.cs
index 783bd9aef..75f06e08c 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2023_02_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_powerpoint_2023_02_main.g.cs
@@ -72,7 +72,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeACB>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeACB.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeACB());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeACB.ElementType, 1, 1, version: FileFormatVersions.Microsoft365)
@@ -240,8 +240,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.CameoEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.UnknownEmpty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.CameoEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.CameoEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.UnknownEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.UnknownEmpty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2009_9_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2009_9_main.g.cs
index 55d2f2229..e95a6c285 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2009_9_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2009_9_main.g.cs
@@ -74,7 +74,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormatting>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormatting.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormatting());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormatting.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -180,7 +180,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DataValidation>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DataValidation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DataValidation());
             builder.AddElement<DataValidations>()
                 .AddAttribute("disablePrompts", a => a.DisablePrompts)
                 .AddAttribute("xWindow", a => a.XWindow)
@@ -253,7 +253,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SparklineGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SparklineGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SparklineGroup());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.SparklineGroup.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -319,7 +319,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerRef>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerRef.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerRef());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.SlicerRef.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -385,7 +385,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ProtectedRange>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ProtectedRange.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ProtectedRange());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.ProtectedRange.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -452,8 +452,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.IgnoredError>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.IgnoredError.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.IgnoredError());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.IgnoredError.ElementType, 0, 0, version: FileFormatVersions.Office2010),
@@ -520,7 +520,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DefinedName>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DefinedName.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DefinedName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.DefinedName.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -586,7 +586,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotCache.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotCache());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PivotCache.ElementType, 1, 0)
@@ -652,7 +652,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerCache.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerCache());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.SlicerCache.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -834,7 +834,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TupleSet>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TupleSet.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TupleSet());
             builder.AddElement<CalculatedMember>()
                 .AddAttribute("displayFolder", a => a.DisplayFolder)
                 .AddAttribute("flattenHierarchies", a => a.FlattenHierarchies)
@@ -961,7 +961,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SetLevels>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SetLevels.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SetLevels());
             builder.AddElement<CacheHierarchy>()
                 .AddAttribute("flattenHierarchies", a => a.FlattenHierarchies)
                 .AddAttribute("measuresSet", a => a.MeasuresSet)
@@ -1271,9 +1271,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotChanges>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotEdits>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormats.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotChanges.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotChanges());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotEdits.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotEdits());
             builder.AddElement<PivotTableDefinition>()
                 .AddAttribute("fillDownLabelsDefault", a => a.FillDownLabelsDefault)
                 .AddAttribute("visualTotalsForSets", a => a.VisualTotalsForSets)
@@ -1501,7 +1501,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.CalculatedMembers>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.CalculatedMembers.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.CalculatedMembers());
             builder.AddElement<Connection>()
                 .AddAttribute("culture", a => a.Culture)
                 .AddAttribute("embeddedDataId", a => a.EmbeddedDataId);
@@ -1651,7 +1651,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerStyle());
             builder.AddElement<SlicerStyles>()
                 .AddAttribute("defaultSlicerStyle", a => a.DefaultSlicerStyle, aBuilder =>
                 {
@@ -1733,7 +1733,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat());
             builder.AddElement<DifferentialFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1841,7 +1841,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DdeValues>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DdeValues.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DdeValues());
             builder.AddElement<OleItem>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -2172,7 +2172,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.CustomFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.CustomFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.CustomFilter());
             builder.AddElement<CustomFilters>()
                 .AddAttribute("and", a => a.And);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2411,7 +2411,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
             builder.AddElement<DatastoreItem>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -2838,8 +2838,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ListItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ListItems.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ListItems());
             builder.AddElement<FormControlProperties>()
                 .AddAttribute("objectType", a => a.ObjectType, aBuilder =>
                 {
@@ -3015,7 +3015,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Slicer>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Slicer.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Slicer());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.Slicer.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -3134,9 +3134,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerCacheDefinitionExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerCacheData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTables>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerCacheDefinitionExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerCacheDefinitionExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerCacheData.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerCacheData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTables.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTables());
             builder.AddElement<SlicerCacheDefinition>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -3295,9 +3295,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingRule>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.ReferenceSequence>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingRule.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingRule());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.ReferenceSequence.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.ReferenceSequence());
             builder.AddElement<ConditionalFormatting>()
                 .AddAttribute("pivot", a => a.Pivot);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -3512,12 +3512,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DifferentialType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ColorScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DataBar>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.IconSet>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DifferentialType.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DifferentialType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ColorScale.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ColorScale());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DataBar.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DataBar());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.IconSet.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.IconSet());
             builder.AddElement<ConditionalFormattingRule>()
                 .AddAttribute("type", a => a.Type)
                 .AddAttribute("priority", a => a.Priority)
@@ -3615,7 +3615,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -3809,9 +3809,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DataValidationForumla1>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DataValidationForumla2>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.ReferenceSequence>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DataValidationForumla1.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DataValidationForumla1());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DataValidationForumla2.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DataValidationForumla2());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.ReferenceSequence.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.ReferenceSequence());
             builder.AddElement<DataValidation>()
                 .AddAttribute("type", a => a.Type)
                 .AddAttribute("errorStyle", a => a.ErrorStyle)
@@ -4062,7 +4062,7 @@ protected DataValidationFormulaType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.Formula());
         }
 
         /// <summary>
@@ -4313,16 +4313,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SeriesColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.NegativeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.AxisColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.MarkersColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.FirstMarkerColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.LastMarkerColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.HighMarkerColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.LowMarkerColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Sparklines>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SeriesColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SeriesColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.NegativeColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.NegativeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.AxisColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.AxisColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.MarkersColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.MarkersColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.FirstMarkerColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.FirstMarkerColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.LastMarkerColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.LastMarkerColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.HighMarkerColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.HighMarkerColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.LowMarkerColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.LowMarkerColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Sparklines.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Sparklines());
             builder.AddElement<SparklineGroup>()
                 .AddAttribute("manualMax", a => a.ManualMax)
                 .AddAttribute("manualMin", a => a.ManualMin)
@@ -5073,7 +5073,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Sparkline>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Sparkline.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Sparkline());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.Sparkline.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -5140,8 +5140,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.ReferenceSequence>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.ReferenceSequence.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.ReferenceSequence());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, 0, 1),
@@ -5348,7 +5348,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ArgumentDescriptions>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ArgumentDescriptions.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ArgumentDescriptions());
             builder.AddElement<DefinedName>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -5443,7 +5443,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ArgumentDescription>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ArgumentDescription.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ArgumentDescription());
             builder.AddElement<ArgumentDescriptions>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -5592,8 +5592,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TupleSetHeaders>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TupleSetRows>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TupleSetHeaders.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TupleSetHeaders());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TupleSetRows.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TupleSetRows());
             builder.AddElement<TupleSet>()
                 .AddAttribute("rowCount", a => a.RowCount)
                 .AddAttribute("columnCount", a => a.ColumnCount);
@@ -5689,7 +5689,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TupleSetHeader>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TupleSetHeader.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TupleSetHeader());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.TupleSetHeader.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -5755,7 +5755,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TupleSetRow>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TupleSetRow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TupleSetRow());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.TupleSetRow.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -5877,7 +5877,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TupleSetRowItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TupleSetRowItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TupleSetRowItem());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.TupleSetRowItem.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -6056,7 +6056,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SetLevel>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SetLevel.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SetLevel());
             builder.AddElement<SetLevels>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -6125,8 +6125,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Color.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject.ElementType, 2, 0, version: FileFormatVersions.Office2010),
@@ -6288,12 +6288,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.FillColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.BorderColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.NegativeFillColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.NegativeBorderColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.BarAxisColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.FillColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.FillColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.BorderColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.BorderColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.NegativeFillColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.NegativeFillColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.NegativeBorderColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.NegativeBorderColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.BarAxisColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.BarAxisColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject());
             builder.AddElement<DataBar>()
                 .AddAttribute("minLength", a => a.MinLength)
                 .AddAttribute("maxLength", a => a.MaxLength)
@@ -6427,8 +6427,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingIcon>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingIcon.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingIcon());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattingValueObject());
             builder.AddElement<IconSet>()
                 .AddAttribute("iconSet", a => a.IconSetTypes)
                 .AddAttribute("showValue", a => a.ShowValue)
@@ -6507,13 +6507,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Alignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Protection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Font>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Border.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Alignment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Alignment());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Protection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Protection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Fill.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Font());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberingFormat());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, 0, 1),
@@ -6697,8 +6697,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.Formula());
             builder.AddElement<ConditionalFormattingValueObject>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -6857,7 +6857,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotEdit>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotEdit.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotEdit());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.PivotEdit.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -6923,7 +6923,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotChange>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotChange.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotChange());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.PivotChange.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -6999,7 +6999,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormat());
             builder.AddElement<ConditionalFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -7077,7 +7077,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculatedMember>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculatedMember.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculatedMember());
             builder.AddElement<CalculatedMembers>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -7148,10 +7148,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotArea>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotUserEdit>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TupleItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotArea.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotArea());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotUserEdit.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotUserEdit());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TupleItems.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TupleItems());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.PivotUserEdit.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -7273,8 +7273,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotEditValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotEditValue.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotEditValue());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, 1, 1),
@@ -7367,7 +7367,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Xstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Xstring.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Xstring());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.Xstring.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -7554,8 +7554,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotAreaReferences>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotAreaReferences.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotAreaReferences());
             builder.AddElement<PivotArea>()
                 .AddAttribute("field", a => a.Field)
                 .AddAttribute("type", a => a.Type)
@@ -7683,9 +7683,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotEditValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TupleItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotEditValue.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotEditValue());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TupleItems.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TupleItems());
             builder.AddElement<PivotChange>()
                 .AddAttribute("allocationMethod", a => a.AllocationMethod)
                 .AddAttribute("weightExpression", a => a.WeightExpression);
@@ -7900,7 +7900,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerStyleElement>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerStyleElement.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerStyleElement());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.SlicerStyleElement.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -7986,7 +7986,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Value>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Value.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Value());
             builder.AddElement<DdeValues>()
                 .AddAttribute("rows", a => a.Rows)
                 .AddAttribute("cols", a => a.Columns);
@@ -8096,8 +8096,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotAreas>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotAreas.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotAreas());
             builder.AddElement<ConditionalFormat>()
                 .AddAttribute("scope", a => a.Scope)
                 .AddAttribute("type", a => a.Type)
@@ -8212,7 +8212,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotArea>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotArea.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotArea());
             builder.AddElement<PivotAreas>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -8290,7 +8290,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerStyleElements>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerStyleElements.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerStyleElements());
             builder.AddElement<SlicerStyle>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -8526,7 +8526,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.ReferenceSequence>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.ReferenceSequence.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.ReferenceSequence());
             builder.AddElement<IgnoredError>()
                 .AddAttribute("evalError", a => a.EvalError)
                 .AddAttribute("twoDigitTextYear", a => a.TwoDigitTextYear)
@@ -8685,7 +8685,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.ReferenceSequence>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.ReferenceSequence.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.ReferenceSequence());
             builder.AddElement<ProtectedRange>()
                 .AddAttribute("password", a => a.Password, aBuilder =>
                 {
@@ -8882,8 +8882,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ListItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ListItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ListItem());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.ListItem.ElementType, 0, 0, version: FileFormatVersions.Office2010),
@@ -9050,7 +9050,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
             builder.AddElement<Slicer>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -9166,9 +9166,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheLevelsData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheSelections>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheLevelsData.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheLevelsData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheSelections.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheSelections());
             builder.AddElement<OlapSlicerCache>()
                 .AddAttribute("pivotCacheId", a => a.PivotCacheId, aBuilder =>
                 {
@@ -9331,8 +9331,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCacheItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCacheItems.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCacheItems());
             builder.AddElement<TabularSlicerCache>()
                 .AddAttribute("pivotCacheId", a => a.PivotCacheId, aBuilder =>
                 {
@@ -9571,7 +9571,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItemParent>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItemParent.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItemParent());
             builder.AddElement<OlapSlicerCacheItem>()
                 .AddAttribute("n", a => a.Name, aBuilder =>
                 {
@@ -9655,7 +9655,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItem());
             builder.AddElement<OlapSlicerCacheRange>()
                 .AddAttribute("startItem", a => a.StartItem, aBuilder =>
                 {
@@ -9727,7 +9727,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheRange>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheRange.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheRange());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheRange.ElementType, 0, 0, version: FileFormatVersions.Office2010)
@@ -9843,7 +9843,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheRanges>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheRanges.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheRanges());
             builder.AddElement<OlapSlicerCacheLevelData>()
                 .AddAttribute("uniqueName", a => a.UniqueName, aBuilder =>
                 {
@@ -9945,7 +9945,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheLevelData>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheLevelData.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheLevelData());
             builder.AddElement<OlapSlicerCacheLevelsData>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -10023,7 +10023,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheSelection>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheSelection.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheSelection());
             builder.AddElement<OlapSlicerCacheSelections>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -10101,7 +10101,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItemParent>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItemParent.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCacheItemParent());
             builder.AddElement<OlapSlicerCacheSelection>()
                 .AddAttribute("n", a => a.Name, aBuilder =>
                 {
@@ -10182,7 +10182,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCacheItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCacheItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCacheItem());
             builder.AddElement<TabularSlicerCacheItems>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -10319,7 +10319,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTable>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTable.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTable());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTable.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -10386,8 +10386,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCache>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCache.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCache());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCache.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.TabularSlicerCache());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.OlapSlicerCache.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -10480,7 +10480,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SlicerCacheDefinitionExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SlicerCacheDefinitionExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SlicerCacheDefinitionExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.SlicerCacheDefinitionExtension.ElementType, 0, 0)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2010_11_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2010_11_main.g.cs
index 40a740b34..f16744961 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2010_11_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2010_11_main.g.cs
@@ -202,7 +202,7 @@ protected OpenXmlPivotCachesElement(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotCache.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotCache());
         }
     }
 
@@ -261,7 +261,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotTableReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotTableReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotTableReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.PivotTableReference.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -392,7 +392,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.WebExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.WebExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.WebExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.WebExtension.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -458,7 +458,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineCacheReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineCacheReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineCacheReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.TimelineCacheReference.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -524,7 +524,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.TimelineReference.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -643,7 +643,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineStyle());
             builder.AddElement<TimelineStyles>()
                 .AddAttribute("defaultTimelineStyle", a => a.DefaultTimelineStyle, aBuilder =>
                 {
@@ -724,7 +724,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat());
             builder.AddElement<DifferentialFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -846,11 +846,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DataFeedProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ModelTextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.OleDbPrpoperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.RangeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DataFeedProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DataFeedProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ModelTextProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ModelTextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.OleDbPrpoperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.OleDbPrpoperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.RangeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.RangeProperties());
             builder.AddElement<Connection>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -1080,8 +1080,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.FieldListActiveTabTopLevelEntity>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.FieldListActiveTabTopLevelEntity.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.FieldListActiveTabTopLevelEntity());
             builder.AddElement<PivotTableUISettings>()
                 .AddAttribute("sourceDataName", a => a.SourceDataName)
                 .AddAttribute("relNeededHidden", a => a.RelNeededHidden);
@@ -1197,7 +1197,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.CachedUniqueName>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.CachedUniqueName.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.CachedUniqueName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.CachedUniqueName.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -1424,9 +1424,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ModelRelationships>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ModelTables>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ModelRelationships.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ModelRelationships());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ModelTables.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ModelTables());
             builder.AddElement<DataModel>()
                 .AddAttribute("minVersionLoad", a => a.MinVersionLoad);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1565,7 +1565,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotRow>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotRow.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotRow());
             builder.AddElement<PivotTableData>()
                 .AddAttribute("rowCount", a => a.RowCount)
                 .AddAttribute("columnCount", a => a.ColumnCount)
@@ -1829,7 +1829,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerCache.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerCache());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.SlicerCache.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -1945,7 +1945,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
             builder.AddElement<TableSlicerCache>()
                 .AddAttribute("tableId", a => a.TableId, aBuilder =>
                 {
@@ -2046,7 +2046,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.SlicerCacheOlapLevelName>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.SlicerCacheOlapLevelName.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.SlicerCacheOlapLevelName());
             builder.AddElement<SlicerCacheHideItemsWithNoData>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2114,7 +2114,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTable>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTable.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTable());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Excel.SlicerCachePivotTable.ElementType, 1, 0, version: FileFormatVersions.Office2010)
@@ -2224,11 +2224,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.SurveyPrSurveyElementPr>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TitlePrSurveyElementPr>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DescriptionPrSurveyElementPr>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.SurveyQuestions>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.SurveyPrSurveyElementPr.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.SurveyPrSurveyElementPr());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TitlePrSurveyElementPr.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TitlePrSurveyElementPr());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DescriptionPrSurveyElementPr.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DescriptionPrSurveyElementPr());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.SurveyQuestions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.SurveyQuestions());
             builder.AddElement<Survey>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -2375,7 +2375,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.Timeline>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.Timeline.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.Timeline());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.Timeline.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -2494,9 +2494,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotTables>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineState>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotTables.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotTables());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineState.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineState());
             builder.AddElement<TimelineCacheDefinition>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -2702,7 +2702,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.Formula());
             builder.AddElement<WebExtension>()
                 .AddAttribute("appRef", a => a.ApplicationReference, aBuilder =>
                 {
@@ -2894,7 +2894,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineStyleElements>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineStyleElements.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineStyleElements());
             builder.AddElement<TimelineStyle>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -3035,7 +3035,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineStyleElement>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineStyleElement.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineStyleElement());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.TimelineStyleElement.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -3147,7 +3147,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DbTable>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DbTable.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DbTable());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.DbTable.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -3419,7 +3419,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TextFields>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TextFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TextFields());
             builder.AddElement<TextProperties>()
                 .AddAttribute("prompt", a => a.Prompt)
                 .AddAttribute("fileType", a => a.FileType)
@@ -3615,8 +3615,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DbCommand>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DbTables>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DbCommand.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DbCommand());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DbTables.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DbTables());
             builder.AddElement<OleDbPrpoperties>()
                 .AddAttribute("connection", a => a.Connection);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -3721,7 +3721,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DbTables>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DbTables.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DbTables());
             builder.AddElement<DataFeedProperties>()
                 .AddAttribute("connection", a => a.Connection, aBuilder =>
                 {
@@ -3862,7 +3862,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -4156,7 +4156,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ModelTable>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ModelTable.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ModelTable());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.ModelTable.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -4222,7 +4222,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ModelRelationship>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ModelRelationship.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ModelRelationship());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.ModelRelationship.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -4309,8 +4309,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.Xstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotValueCellExtra>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.Xstring.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.Xstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotValueCellExtra.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotValueCellExtra());
             builder.AddElement<PivotValueCell>()
                 .AddAttribute("i", a => a.Item)
                 .AddAttribute("t", a => a.Text);
@@ -4575,7 +4575,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ServerFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ServerFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ServerFormat());
             builder.AddElement<PivotTableServerFormats>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -5163,7 +5163,7 @@ public EnumValue<DocumentFormat.OpenXml.Office2013.Excel.SurveyPosition>? Positi
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
             builder.AddElement<OpenXmlSurveyElementPrElement>()
                 .AddAttribute("cssClass", a => a.CssClass)
                 .AddAttribute("bottom", a => a.Bottom)
@@ -5245,8 +5245,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.QuestionsPrSurveyElementPr>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.SurveyQuestion>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.QuestionsPrSurveyElementPr.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.QuestionsPrSurveyElementPr());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.SurveyQuestion.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.SurveyQuestion());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.QuestionsPrSurveyElementPr.ElementType, 0, 1, version: FileFormatVersions.Office2013),
@@ -5417,8 +5417,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.QuestionPrSurveyElementPr>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.QuestionPrSurveyElementPr.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.QuestionPrSurveyElementPr());
             builder.AddElement<SurveyQuestion>()
                 .AddAttribute("binding", a => a.Binding, aBuilder =>
                 {
@@ -5634,7 +5634,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
             builder.AddElement<Timeline>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -5927,9 +5927,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FilterColumn>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortState>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FilterColumn.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FilterColumn());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortState.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortState());
             builder.AddElement<AutoFilter>()
                 .AddAttribute("ref", a => a.Reference);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -5999,7 +5999,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotTable>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotTable.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotTable());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotTable.ElementType, 1, 0, version: FileFormatVersions.Office2013)
@@ -6148,10 +6148,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.MovingPeriodState>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.SelectionTimelineRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.BoundsTimelineRange>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.MovingPeriodState.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.MovingPeriodState());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.SelectionTimelineRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.SelectionTimelineRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.BoundsTimelineRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.BoundsTimelineRange());
             builder.AddElement<TimelineState>()
                 .AddAttribute("singleRangeFilterState", a => a.SingleRangeFilterState)
                 .AddAttribute("minimalRefreshVersion", a => a.MinimalRefreshVersion, aBuilder =>
@@ -6313,7 +6313,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotValueCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotValueCell.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotValueCell());
             builder.AddElement<PivotRow>()
                 .AddAttribute("r", a => a.Reference)
                 .AddAttribute("count", a => a.Count, aBuilder =>
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2014_11_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2014_11_main.g.cs
index 0773086ad..cae89e12e 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2014_11_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2014_11_main.g.cs
@@ -71,7 +71,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.ExcelAc.ModelTimeGrouping>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.ExcelAc.ModelTimeGrouping.ElementType, static () => new DocumentFormat.OpenXml.Office2016.ExcelAc.ModelTimeGrouping());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.ExcelAc.ModelTimeGrouping.ElementType, 1, 0, version: FileFormatVersions.Office2016)
@@ -167,7 +167,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.ExcelAc.CalculatedTimeColumn>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.ExcelAc.CalculatedTimeColumn.ElementType, static () => new DocumentFormat.OpenXml.Office2016.ExcelAc.CalculatedTimeColumn());
             builder.AddElement<ModelTimeGrouping>()
                 .AddAttribute("tableName", a => a.TableName, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2014_revision.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2014_revision.g.cs
index 71f7d7e60..57906b797 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2014_revision.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2014_revision.g.cs
@@ -113,7 +113,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExHeader>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExHeader.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExHeader());
             builder.AddElement<RevExHeaders>()
                 .AddAttribute("minRev", a => a.MinRev, aBuilder =>
                 {
@@ -209,20 +209,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExChangeCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExChgObj>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExDefinedName>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExDelObj>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExFormatting>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExFuture>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExMove>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExRowColumn>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExSheetOp>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExTrimmed>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExUnsupported>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevisionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevListAutoExpandRw>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExChangeCell.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExChangeCell());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExChgObj.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExChgObj());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExDefinedName.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExDefinedName());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExDelObj.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExDelObj());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExFormatting.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExFormatting());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExFuture.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExFuture());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExMove.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExMove());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExRowColumn.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExRowColumn());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExSheetOp.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExSheetOp());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExTrimmed.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExTrimmed());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExUnsupported.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExUnsupported());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevisionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevisionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevListAutoExpandRw.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevListAutoExpandRw());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Excel.RevExFuture.ElementType, 0, 0, version: FileFormatVersions.Office2016),
@@ -307,13 +307,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Alignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Protection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Font>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Border.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Alignment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Alignment());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Protection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Protection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Fill.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Font());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberingFormat());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, 0, 1),
@@ -541,12 +541,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.AutoFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.Comments>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.DataValidation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.pivotTableDefinition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.SparklineGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.AutoFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.AutoFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.Comments.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.Comments());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.DataValidation.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.DataValidation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.pivotTableDefinition.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.pivotTableDefinition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.SparklineGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.SparklineGroup());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Excel.DataValidation.ElementType, 1, 1, version: FileFormatVersions.Office2016),
@@ -840,7 +840,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExTest>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExTest.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExTest());
             builder.AddElement<RevExFuture>()
                 .AddAttribute("rev", a => a.Rev, aBuilder =>
                 {
@@ -1513,8 +1513,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.ChangeCellSubEdit>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.ChangeCellSubEdit.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.ChangeCellSubEdit());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevCell.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevCell());
             builder.AddElement<RevExChangeCell>()
                 .AddAttribute("listUid", a => a.ListUid, aBuilder =>
                 {
@@ -1803,8 +1803,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.DifferentialFormatType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.DifferentialFormatType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.DifferentialFormatType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.ExtensionList());
             builder.AddElement<RevExFormatting>()
                 .AddAttribute("rev", a => a.Rev, aBuilder =>
                 {
@@ -2098,8 +2098,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.FormulaFormula>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.FormulaFormula.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.FormulaFormula());
             builder.AddElement<RevExDefinedName>()
                 .AddAttribute("rev", a => a.Rev, aBuilder =>
                 {
@@ -2276,7 +2276,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.StateBasedHeader>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.StateBasedHeader.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.StateBasedHeader());
             builder.AddElement<RevExDelObj>()
                 .AddAttribute("rev", a => a.Rev, aBuilder =>
                 {
@@ -2427,9 +2427,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevisionState>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevisionStateLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.StateBasedHeader>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevisionState.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevisionState());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevisionStateLink.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevisionStateLink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.StateBasedHeader.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.StateBasedHeader());
             builder.AddElement<RevExChgObj>()
                 .AddAttribute("rev", a => a.Rev, aBuilder =>
                 {
@@ -3068,19 +3068,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExChangeCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExChgObj>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExDefinedName>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExDelObj>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExFormatting>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExFuture>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExMove>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExRowColumn>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExSheetOp>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExTrimmed>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevExUnsupported>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevisionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevListAutoExpandRw>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExChangeCell.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExChangeCell());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExChgObj.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExChgObj());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExDefinedName.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExDefinedName());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExDelObj.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExDelObj());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExFormatting.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExFormatting());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExFuture.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExFuture());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExMove.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExMove());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExRowColumn.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExRowColumn());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExSheetOp.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExSheetOp());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExTrimmed.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExTrimmed());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevExUnsupported.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevExUnsupported());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevisionList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevisionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevListAutoExpandRw.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevListAutoExpandRw());
             builder.AddElement<RevGroup>()
                 .AddAttribute("rev", a => a.Rev, aBuilder =>
                 {
@@ -3251,9 +3251,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RstType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.FFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.Xstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RstType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RstType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.FFormula.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.FFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.Xstring.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.Xstring());
             builder.AddElement<RevCell>()
                 .AddAttribute("t", a => a.T)
                 .AddAttribute("nop", a => a.Nop)
@@ -3405,7 +3405,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RevCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RevCell.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RevCell());
             builder.AddElement<ChangeCellSubEdit>()
                 .AddAttribute("r", a => a.R, aBuilder =>
                 {
@@ -3479,7 +3479,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -3689,7 +3689,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RefMap>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RefMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RefMap());
             builder.AddElement<StateBasedHeader>()
                 .AddAttribute("uid", a => a.Uid, aBuilder =>
                 {
@@ -3834,11 +3834,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.FreezePanes>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.HideUnhideSheet>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.Outlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RowColVisualOps>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.ShowGridlinesHeadings>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.FreezePanes.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.FreezePanes());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.HideUnhideSheet.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.HideUnhideSheet());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.Outlines.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.Outlines());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RowColVisualOps.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RowColVisualOps());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.ShowGridlinesHeadings.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.ShowGridlinesHeadings());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Excel.RowColVisualOps.ElementType, 0, 1, version: FileFormatVersions.Office2016),
@@ -3977,11 +3977,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RefCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RefFuture>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RefOartAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.RefTest>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.SheetXluid>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RefCell.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RefCell());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RefFuture.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RefFuture());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RefOartAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RefOartAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.RefTest.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.RefTest());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.SheetXluid.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.SheetXluid());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2016.Excel.RefCell.ElementType, 1, 1, version: FileFormatVersions.Office2016),
@@ -4295,7 +4295,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Excel.Outline>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Excel.Outline.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Excel.Outline());
             builder.AddElement<Outlines>()
                 .AddAttribute("isRow", a => a.IsRow, aBuilder =>
                 {
@@ -4473,10 +4473,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PhoneticRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PhoneticRun.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PhoneticRun());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Run.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Text.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Text());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Text.ElementType, 0, 1),
@@ -5243,9 +5243,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Formula1>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Formula2>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.ExcelAc.List>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Formula1.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Formula1());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Formula2.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Formula2());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.ExcelAc.List.ElementType, static () => new DocumentFormat.OpenXml.Office2010.ExcelAc.List());
             builder.AddElement<DataValidation>()
                 .AddAttribute("type", a => a.Type)
                 .AddAttribute("errorStyle", a => a.ErrorStyle)
@@ -5641,16 +5641,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SeriesColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.NegativeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.AxisColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.MarkersColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.FirstMarkerColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.LastMarkerColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.HighMarkerColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.LowMarkerColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Excel.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Sparklines>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SeriesColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SeriesColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.NegativeColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.NegativeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.AxisColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.AxisColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.MarkersColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.MarkersColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.FirstMarkerColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.FirstMarkerColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.LastMarkerColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.LastMarkerColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.HighMarkerColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.HighMarkerColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.LowMarkerColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.LowMarkerColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Excel.Formula.ElementType, static () => new DocumentFormat.OpenXml.Office.Excel.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Sparklines.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Sparklines());
             builder.AddElement<SparklineGroup>()
                 .AddAttribute("manualMax", a => a.ManualMax)
                 .AddAttribute("manualMin", a => a.ManualMin)
@@ -5875,9 +5875,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Authors>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CommentList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Authors.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Authors());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CommentList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CommentList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Authors.ElementType, 1, 1),
@@ -5996,9 +5996,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FilterColumn>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortState>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FilterColumn.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FilterColumn());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortState.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortState());
             builder.AddElement<AutoFilter>()
                 .AddAttribute("ref", a => a.Reference);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -6764,23 +6764,23 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2016;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchiesUsage>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnItems>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Formats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Location>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFilters>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotHierarchies>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotTableStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowHierarchiesUsage>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchiesUsage.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchiesUsage());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnItems());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Formats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Formats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Location.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Location());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFilters.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFilters());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotHierarchies.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotHierarchies());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotTableStyle.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotTableStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowHierarchiesUsage.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowHierarchiesUsage());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowItems());
             builder.AddElement<pivotTableDefinition>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_dynamicarray.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_dynamicarray.g.cs
index 1df549f49..494a1e78c 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_dynamicarray.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_dynamicarray.g.cs
@@ -92,7 +92,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.DynamicArray.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.DynamicArray.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.DynamicArray.ExtensionList());
             builder.AddElement<DynamicArrayProperties>()
                 .AddAttribute("fDynamic", a => a.FDynamic)
                 .AddAttribute("fCollapsed", a => a.FCollapsed);
@@ -174,7 +174,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_richdata.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_richdata.g.cs
index f4ea1d744..346026b02 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_richdata.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_richdata.g.cs
@@ -129,8 +129,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValue.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValue());
             builder.AddElement<RichValueData>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -244,8 +244,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValueStructure>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValueStructure.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValueStructure());
             builder.AddElement<RichValueStructures>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -359,8 +359,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValueFallback>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData.Value>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValueFallback.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData.RichValueFallback());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData.Value.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData.Value());
             builder.AddElement<RichValue>()
                 .AddAttribute("s", a => a.S, aBuilder =>
                 {
@@ -445,7 +445,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -627,7 +627,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData.Key>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData.Key.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData.Key());
             builder.AddElement<RichValueStructure>()
                 .AddAttribute("t", a => a.T, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_richdata2.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_richdata2.g.cs
index 9f32540f0..4528db988 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_richdata2.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2017_richdata2.g.cs
@@ -76,11 +76,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.CustomRichFilters>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.DynamicRichFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFilters>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichTop10>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.CustomRichFilters.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.CustomRichFilters());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.DynamicRichFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.DynamicRichFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFilters.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFilters());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichTop10.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichTop10());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFilters.ElementType, 1, 1, version: FileFormatVersions.Office2019),
@@ -339,8 +339,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArrayData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagData>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArrayData.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArrayData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagData.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArrayData.ElementType, 0, 1, version: FileFormatVersions.Office2019),
@@ -475,8 +475,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagStructure>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagStructure.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagStructure());
             builder.AddElement<SupportingPropertyBagStructures>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -590,8 +590,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.Array>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.Array.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.Array());
             builder.AddElement<ArrayData>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -697,10 +697,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.Dxfs>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFormatProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStyles>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.Dxfs.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.Dxfs());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFormatProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFormatProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStyles.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStyles());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.Dxfs.ElementType, 0, 1, version: FileFormatVersions.Office2019),
@@ -854,9 +854,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueGlobalType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypes>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueGlobalType.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueGlobalType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypes.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypes());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueGlobalType.ElementType, 0, 1, version: FileFormatVersions.Office2019),
@@ -996,9 +996,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichDateGroupItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichDateGroupItem.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichDateGroupItem());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFilter());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFilter.ElementType, 0, 0, version: FileFormatVersions.Office2019),
@@ -1167,8 +1167,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.CustomRichFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.CustomRichFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.CustomRichFilter());
             builder.AddElement<CustomRichFilters>()
                 .AddAttribute("and", a => a.And);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1347,7 +1347,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -1697,8 +1697,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArray>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArray.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArray());
             builder.AddElement<SupportingPropertyBagArrayData>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -1781,8 +1781,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBag>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBag.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBag());
             builder.AddElement<SupportingPropertyBagData>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -1864,7 +1864,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagValue.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagValue());
             builder.AddElement<SupportingPropertyBag>()
                 .AddAttribute("s", a => a.S, aBuilder =>
                 {
@@ -1979,7 +1979,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagKey>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagKey.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagKey());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagKey.ElementType, 1, 0, version: FileFormatVersions.Office2019)
@@ -2112,7 +2112,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArrayValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArrayValue.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.SupportingPropertyBagArrayValue());
             builder.AddElement<SupportingPropertyBagArray>()
                 .AddAttribute("count", a => a.Count, aBuilder =>
                 {
@@ -2259,7 +2259,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ArrayValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ArrayValue.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ArrayValue());
             builder.AddElement<Array>()
                 .AddAttribute("r", a => a.R, aBuilder =>
                 {
@@ -2397,7 +2397,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat());
             builder.AddElement<Dxfs>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2465,7 +2465,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFormatProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFormatProperty.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFormatProperty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichFormatProperty.ElementType, 1, 0, version: FileFormatVersions.Office2019)
@@ -2531,7 +2531,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStyle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStyle.ElementType, 1, 0, version: FileFormatVersions.Office2019)
@@ -2667,7 +2667,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStylePropertyValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStylePropertyValue.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichStylePropertyValue());
             builder.AddElement<RichStyle>()
                 .AddAttribute("dxfid", a => a.Dxfid);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2795,8 +2795,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeKeyFlags>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeKeyFlags.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeKeyFlags());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeKeyFlags.ElementType, 0, 1, version: FileFormatVersions.Office2019),
@@ -2889,7 +2889,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueType>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueType.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueType.ElementType, 0, 0, version: FileFormatVersions.Office2019)
@@ -2966,8 +2966,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeKeyFlags>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeKeyFlags.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeKeyFlags());
             builder.AddElement<RichValueType>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -3065,7 +3065,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeReservedKey>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeReservedKey.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeReservedKey());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeReservedKey.ElementType, 1, 0, version: FileFormatVersions.Office2019)
@@ -3141,7 +3141,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeReservedKeyFlag>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeReservedKeyFlag.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.RichData2.RichValueTypeReservedKeyFlag());
             builder.AddElement<RichValueTypeReservedKey>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2018_calcfeatures.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2018_calcfeatures.g.cs
index 7a5e65f5e..d497f1f9c 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2018_calcfeatures.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2018_calcfeatures.g.cs
@@ -71,7 +71,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.CalcFeatures.CalcFeature>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.CalcFeatures.CalcFeature.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.CalcFeatures.CalcFeature());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.CalcFeatures.CalcFeature.ElementType, 1, 0, version: FileFormatVersions.Office2019)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2018_threadedcomments.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2018_threadedcomments.g.cs
index 07430f3a5..5896dc8fe 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2018_threadedcomments.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2018_threadedcomments.g.cs
@@ -73,8 +73,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.Person>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.Person.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.Person());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.Person.ElementType, 0, 0, version: FileFormatVersions.Office2019),
@@ -173,8 +173,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedComment>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedComment.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedComment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedComment.ElementType, 0, 0, version: FileFormatVersions.Office2019),
@@ -312,7 +312,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList());
             builder.AddElement<Person>()
                 .AddAttribute("displayName", a => a.DisplayName, aBuilder =>
                 {
@@ -403,7 +403,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -537,9 +537,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedCommentText>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedCommentMentions>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedCommentText.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedCommentText());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedCommentMentions.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.ThreadedCommentMentions());
             builder.AddElement<ThreadedComment>()
                 .AddAttribute("ref", a => a.Ref)
                 .AddAttribute("dT", a => a.DT)
@@ -708,7 +708,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.Mention>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.Mention.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.Mention());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments.Mention.ElementType, 0, 0, version: FileFormatVersions.Office2019)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2019_namedsheetviews.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2019_namedsheetviews.g.cs
index c992f1e2f..cd5f73c58 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2019_namedsheetviews.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2019_namedsheetviews.g.cs
@@ -75,8 +75,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.NamedSheetView>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.NamedSheetView.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.NamedSheetView());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.NamedSheetView.ElementType, 0, 0, version: FileFormatVersions.Office2021),
@@ -195,8 +195,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.NsvFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.NsvFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.NsvFilter());
             builder.AddElement<NamedSheetView>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -273,7 +273,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -377,9 +377,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ColumnFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortRules>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ColumnFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ColumnFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortRules.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortRules());
             builder.AddElement<NsvFilter>()
                 .AddAttribute("filterId", a => a.FilterId, aBuilder =>
                 {
@@ -477,9 +477,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.DifferentialFormatType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.FilterColumn>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.DifferentialFormatType.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.DifferentialFormatType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.FilterColumn.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.FilterColumn());
             builder.AddElement<ColumnFilter>()
                 .AddAttribute("colId", a => a.ColId, aBuilder =>
                 {
@@ -590,8 +590,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortRule>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortRule.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortRule());
             builder.AddElement<SortRules>()
                 .AddAttribute("sortMethod", a => a.SortMethod)
                 .AddAttribute("caseSensitive", a => a.CaseSensitive);
@@ -667,13 +667,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Alignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Protection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Font>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Border.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Alignment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Alignment());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Protection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Protection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Fill.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Font());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberingFormat());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, 0, 1),
@@ -874,15 +874,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColorFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomFilters>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DynamicFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Filters>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.IconFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Top10>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.CustomFilters>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.IconFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColorFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColorFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomFilters.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomFilters());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DynamicFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DynamicFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Filters.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Filters());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.IconFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.IconFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Top10.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Top10());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.CustomFilters.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.CustomFilters());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.IconFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.IconFilter());
             builder.AddElement<FilterColumn>()
                 .AddAttribute("colId", a => a.ColumnId, aBuilder =>
                 {
@@ -1102,9 +1102,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.DifferentialFormatType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortCondition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.RichSortCondition>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.DifferentialFormatType.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.DifferentialFormatType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortCondition.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.SortCondition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.RichSortCondition.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.NamedSheetViews.RichSortCondition());
             builder.AddElement<SortRule>()
                 .AddAttribute("colId", a => a.ColId, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_richdatawebimage.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_richdatawebimage.g.cs
index f478800c7..791037ad1 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_richdatawebimage.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_richdatawebimage.g.cs
@@ -73,8 +73,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.WebImageSupportingRichData>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.WebImageSupportingRichData.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.WebImageSupportingRichData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.WebImageSupportingRichData.ElementType, 0, 0, version: FileFormatVersions.Office2021),
@@ -174,9 +174,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.AddressWebImageSupportingRichDataRelationship>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.MoreImagesAddressWebImageSupportingRichDataRelationship>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.BlipWebImageSupportingRichDataRelationship>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.AddressWebImageSupportingRichDataRelationship.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.AddressWebImageSupportingRichDataRelationship());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.MoreImagesAddressWebImageSupportingRichDataRelationship.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.MoreImagesAddressWebImageSupportingRichDataRelationship());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.BlipWebImageSupportingRichDataRelationship.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.BlipWebImageSupportingRichDataRelationship());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Excel.RichDataWebImage.AddressWebImageSupportingRichDataRelationship.ElementType, 1, 1, version: FileFormatVersions.Office2021),
@@ -283,7 +283,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_richvaluerefresh.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_richvaluerefresh.g.cs
index 2b0b392dc..743387cc2 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_richvaluerefresh.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_richvaluerefresh.g.cs
@@ -71,7 +71,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.RichValueRefreshIntervals.RichValueRefreshInterval>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.RichValueRefreshIntervals.RichValueRefreshInterval.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.RichValueRefreshIntervals.RichValueRefreshInterval());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Excel.RichValueRefreshIntervals.RichValueRefreshInterval.ElementType, 1, 0, version: FileFormatVersions.Office2021)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_threadedcomments2.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_threadedcomments2.g.cs
index 240581a21..aa7b8954a 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_threadedcomments2.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2020_threadedcomments2.g.cs
@@ -147,7 +147,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.ThreadedComments2.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.ThreadedComments2.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.ThreadedComments2.ExtensionList());
             builder.AddElement<CommentHyperlink>()
                 .AddAttribute("startIndex", a => a.StartIndex, aBuilder =>
                 {
@@ -239,7 +239,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2021_extlinks2021.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2021_extlinks2021.g.cs
index bb11eb3be..244b4e107 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2021_extlinks2021.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2021_extlinks2021.g.cs
@@ -92,8 +92,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.AbsoluteUrlAlternateUrl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.RelativeUrlAlternateUrl>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.AbsoluteUrlAlternateUrl.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.AbsoluteUrlAlternateUrl());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.RelativeUrlAlternateUrl.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.RelativeUrlAlternateUrl());
             builder.AddElement<ExternalBookAlternateUrls>()
                 .AddAttribute("driveId", a => a.DriveId)
                 .AddAttribute("itemId", a => a.ItemId);
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_featurepropertybag.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_featurepropertybag.g.cs
index 6e035f38f..4561e2db2 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_featurepropertybag.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_featurepropertybag.g.cs
@@ -84,9 +84,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagExtensions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FeaturePropertyBag>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagExtensions.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagExtensions());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FeaturePropertyBag.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FeaturePropertyBag());
             builder.AddElement<FeaturePropertyBags>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -266,9 +266,9 @@ public UInt32Value? Count
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagExtensions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FeaturePropertyBag>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagExtensions.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagExtensions());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FeaturePropertyBag.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FeaturePropertyBag());
             builder.AddElement<OpenXmlFeaturePropertyBagsElement>()
                 .AddAttribute("count", a => a.Count);
         }
@@ -422,8 +422,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DifferentialFormatType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FpbsFeaturePropertyBags>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DifferentialFormatType.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DifferentialFormatType());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FpbsFeaturePropertyBags.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FpbsFeaturePropertyBags());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FpbsFeaturePropertyBags.ElementType, 1, 1, version: FileFormatVersions.Microsoft365),
@@ -1118,8 +1118,8 @@ protected OpenXmlTableRevDxfElement(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DifferentialFormatType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FpbsFeaturePropertyBags>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DifferentialFormatType.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DifferentialFormatType());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FpbsFeaturePropertyBags.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.FpbsFeaturePropertyBags());
         }
 
         /// <summary>
@@ -1204,7 +1204,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ExtensionList.ElementType, 0, 1, version: FileFormatVersions.Microsoft365)
@@ -1329,13 +1329,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ArrayFeatureProperty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagFeatureProperty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BoolFeatureProperty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DecimalFeatureProperty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.IntFeatureProperty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.RelFeatureProperty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.StringFeatureProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ArrayFeatureProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.ArrayFeatureProperty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagFeatureProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BagFeatureProperty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BoolFeatureProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.BoolFeatureProperty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DecimalFeatureProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.DecimalFeatureProperty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.IntFeatureProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.IntFeatureProperty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.RelFeatureProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.RelFeatureProperty());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.StringFeatureProperty.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.StringFeatureProperty());
             builder.AddElement<FeaturePropertyBag>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -1415,7 +1415,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -1502,12 +1502,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsdboolean>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsddouble>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsdinteger>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.SXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.RelXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.XsdunsignedInt>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsdboolean.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsdboolean());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsddouble.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsddouble());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsdinteger.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.Xsdinteger());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.SXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.SXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.RelXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.RelXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.XsdunsignedInt.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.FeaturePropertyBag.XsdunsignedInt());
             builder.AddElement<ArrayFeatureProperty>()
                 .AddAttribute("k", a => a.K, aBuilder =>
                 {
@@ -1943,13 +1943,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Alignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Protection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Font>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Border.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Alignment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Alignment());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Protection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Protection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Fill.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Font());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberingFormat());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, 0, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotVersionInfo.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotVersionInfo.g.cs
index d0c577df3..c6475c80b 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotVersionInfo.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_pivotVersionInfo.g.cs
@@ -72,8 +72,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.RequiredFeatureXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.LastRefreshFeatureXsdstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.RequiredFeatureXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.RequiredFeatureXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.LastRefreshFeatureXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.LastRefreshFeatureXsdstring());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.RequiredFeatureXsdstring.ElementType, 0, 0, version: FileFormatVersions.Microsoft365),
@@ -141,8 +141,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.RequiredFeatureXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.LastUpdateFeatureXsdstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.RequiredFeatureXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.RequiredFeatureXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.LastUpdateFeatureXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.LastUpdateFeatureXsdstring());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.RequiredFeatureXsdstring.ElementType, 0, 0, version: FileFormatVersions.Microsoft365),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_richvaluerel.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_richvaluerel.g.cs
index de6a7966d..c19b6ae0c 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_richvaluerel.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2022_richvaluerel.g.cs
@@ -73,8 +73,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.RichValueRel.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Y2022.RichValueRel.RichValueRelRelationship>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.RichValueRel.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.RichValueRel.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Y2022.RichValueRel.RichValueRelRelationship.ElementType, static () => new DocumentFormat.OpenXml.Office.Y2022.RichValueRel.RichValueRelRelationship());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Y2022.RichValueRel.RichValueRelRelationship.ElementType, 0, 0, version: FileFormatVersions.Microsoft365),
@@ -190,7 +190,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_dataSourceVersioning.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_dataSourceVersioning.g.cs
index 4138be49c..a51921001 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_dataSourceVersioning.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_dataSourceVersioning.g.cs
@@ -73,9 +73,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.RequiredFeatureXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.LastRefreshFeatureXsdstring>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.LastEditFeatureXsdstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.RequiredFeatureXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.RequiredFeatureXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.LastRefreshFeatureXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.LastRefreshFeatureXsdstring());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.LastEditFeatureXsdstring.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.LastEditFeatureXsdstring());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.DataSourceVersioning.RequiredFeatureXsdstring.ElementType, 0, 0, version: FileFormatVersions.Microsoft365),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_msForms.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_msForms.g.cs
index 8e5e14f02..4db9ea193 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_msForms.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_spreadsheetml_2023_msForms.g.cs
@@ -82,7 +82,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.ExtensionList());
             builder.AddElement<Question>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -207,8 +207,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.SyncedQuestionId>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.SyncedQuestionId.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.SyncedQuestionId());
             builder.AddElement<MsForm>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -327,7 +327,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_tasks_2019_documenttasks.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_tasks_2019_documenttasks.g.cs
index 91da7a316..15bfbf7ba 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_tasks_2019_documenttasks.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_tasks_2019_documenttasks.g.cs
@@ -73,8 +73,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.Task>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.Task.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.Task());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.DocumentTasks.Task.ElementType, 0, 0, version: FileFormatVersions.Office2021),
@@ -184,9 +184,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskHistory>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskHistory.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskHistory());
             builder.AddElement<Task>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -299,7 +299,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.OfficeExtLst.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.OfficeExtLst.Extension.ElementType, static () => new DocumentFormat.OpenXml.Office2021.OfficeExtLst.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.OfficeExtLst.Extension.ElementType, 0, 0, version: FileFormatVersions.Office2021)
@@ -366,8 +366,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.CommentAnchor>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.CommentAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.CommentAnchor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.DocumentTasks.CommentAnchor.ElementType, 0, 1, version: FileFormatVersions.Office2021),
@@ -460,7 +460,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskHistoryEvent>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskHistoryEvent.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskHistoryEvent());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskHistoryEvent.ElementType, 0, 0, version: FileFormatVersions.Office2021)
@@ -559,20 +559,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskCreateEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskDeleteEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskPriorityEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskProgressEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskScheduleEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskTitleEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUnassignAll>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUndeleteEventInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUndo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.AttributionTaskUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.AssignTaskUser>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.DocumentTasks.UnassignTaskUser>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskAnchor.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskCreateEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskCreateEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskDeleteEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskDeleteEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskPriorityEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskPriorityEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskProgressEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskProgressEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskScheduleEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskScheduleEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskTitleEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskTitleEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUnassignAll.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUnassignAll());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUndeleteEventInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUndeleteEventInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUndo.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.TaskUndo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.AttributionTaskUser.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.AttributionTaskUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.AssignTaskUser.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.AssignTaskUser());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.DocumentTasks.UnassignTaskUser.ElementType, static () => new DocumentFormat.OpenXml.Office2021.DocumentTasks.UnassignTaskUser());
             builder.AddElement<TaskHistoryEvent>()
                 .AddAttribute("time", a => a.Time, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_thememl_2012_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_thememl_2012_main.g.cs
index e20cb74e4..52591bfe2 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_thememl_2012_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_thememl_2012_main.g.cs
@@ -103,7 +103,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Theme.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Theme.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Theme.OfficeArtExtensionList());
             builder.AddElement<ThemeFamily>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -198,7 +198,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -323,7 +323,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Theme.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Theme.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Theme.OfficeArtExtensionList());
             builder.AddElement<ThemeVariant>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -426,7 +426,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Theme.ThemeVariant>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Theme.ThemeVariant.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Theme.ThemeVariant());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Theme.ThemeVariant.ElementType, 1, 0, version: FileFormatVersions.Office2013)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_webextensions_taskpanes_2010_11.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_webextensions_taskpanes_2010_11.g.cs
index e77cf28b5..105cf08eb 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_webextensions_taskpanes_2010_11.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_webextensions_taskpanes_2010_11.g.cs
@@ -74,7 +74,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtentionPane.WebExtensionTaskpane>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtentionPane.WebExtensionTaskpane.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtentionPane.WebExtensionTaskpane());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.WebExtentionPane.WebExtensionTaskpane.ElementType, 0, 0, version: FileFormatVersions.Office2013)
@@ -221,7 +221,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -344,8 +344,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtentionPane.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtentionPane.WebExtensionPartReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtentionPane.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtentionPane.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtentionPane.WebExtensionPartReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtentionPane.WebExtensionPartReference());
             builder.AddElement<WebExtensionTaskpane>()
                 .AddAttribute("dockstate", a => a.DockState, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_webextensions_webextension_2010_11.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_webextensions_webextension_2010_11.g.cs
index 8bddbe068..10ad55126 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_webextensions_webextension_2010_11.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_webextensions_webextension_2010_11.g.cs
@@ -98,12 +98,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.Snapshot>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionBindingList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionPropertyBag>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionStoreReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionReferenceList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.Snapshot.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.Snapshot());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionBindingList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionBindingList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionPropertyBag.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionPropertyBag());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionStoreReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionStoreReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionReferenceList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionReferenceList());
             builder.AddElement<WebExtension>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -399,7 +399,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -501,7 +501,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList());
             builder.AddElement<WebExtensionBinding>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -633,7 +633,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.OfficeArtExtensionList());
             builder.AddElement<WebExtensionStoreReference>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -724,7 +724,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionStoreReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionStoreReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionStoreReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionStoreReference.ElementType, 0, 0, version: FileFormatVersions.Office2013)
@@ -790,7 +790,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionProperty.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionProperty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionProperty.ElementType, 0, 0, version: FileFormatVersions.Office2013)
@@ -856,7 +856,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionBinding>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionBinding.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionBinding());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionBinding.ElementType, 0, 0, version: FileFormatVersions.Office2013)
@@ -975,24 +975,24 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaBiLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaCeiling>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaFloor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaInverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulationEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulationFixed>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaReplace>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BiLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blur>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorReplacement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Duotone>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillOverlay>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Grayscale>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hsl>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TintEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaBiLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaBiLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaCeiling.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaCeiling());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaFloor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaFloor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaInverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaInverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulationEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulationEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulationFixed.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulationFixed());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaReplace.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaReplace());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BiLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BiLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blur.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blur());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorChange.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorChange());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorReplacement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorReplacement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Duotone.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Duotone());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillOverlay.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillOverlay());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Grayscale.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Grayscale());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hsl.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hsl());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TintEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TintEffect());
             builder.AddElement<Snapshot>()
                 .AddAttribute("r:embed", a => a.Embed)
                 .AddAttribute("r:link", a => a.Link)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2006_wordml.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2006_wordml.g.cs
index bed427407..832765846 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2006_wordml.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2006_wordml.g.cs
@@ -74,10 +74,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.AllocatedCommands>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.KeyMapCustomizations>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.MismatchedKeyMapCustomization>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.Toolbars>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.AllocatedCommands.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.AllocatedCommands());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.KeyMapCustomizations.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.KeyMapCustomizations());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.MismatchedKeyMapCustomization.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.MismatchedKeyMapCustomization());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.Toolbars.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.Toolbars());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.KeyMapCustomizations.ElementType, 0, 0),
@@ -176,7 +176,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.Mcd>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.Mcd.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.Mcd());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.Mcd.ElementType, 0, 0)
@@ -242,8 +242,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.DocEvents>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.Mcds>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.DocEvents.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.DocEvents());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.Mcds.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.Mcds());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.DocEvents.ElementType, 0, 1),
@@ -366,7 +366,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.SingleDataSourceRecord>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.SingleDataSourceRecord.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.SingleDataSourceRecord());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.SingleDataSourceRecord.ElementType, 1, 0)
@@ -830,11 +830,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.AllocatedCommandKeyboardCustomization>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.FixedCommandKeyboardCustomization>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.CharacterInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.MacroKeyboardCustomization>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.WllMacroKeyboardCustomization>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.AllocatedCommandKeyboardCustomization.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.AllocatedCommandKeyboardCustomization());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.FixedCommandKeyboardCustomization.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.FixedCommandKeyboardCustomization());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.CharacterInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.CharacterInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.MacroKeyboardCustomization.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.MacroKeyboardCustomization());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.WllMacroKeyboardCustomization.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.WllMacroKeyboardCustomization());
             builder.AddElement<KeyMapEntry>()
                 .AddAttribute("wne:chmPrimary", a => a.CharacterMapPrimary, aBuilder =>
                 {
@@ -1757,19 +1757,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocNewXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocOpenXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocCloseXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocSyncXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocXmlAfterInsertXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocXmlBeforeDeleteXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocContentControlAfterInsertXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocContentControlBeforeDeleteXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocContentControlOnExistXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocContentControlOnEnterXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocStoreUpdateXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocContentControlUpdateXsdString>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.EventDocBuildingBlockAfterInsertXsdString>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocNewXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocNewXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocOpenXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocOpenXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocCloseXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocCloseXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocSyncXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocSyncXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocXmlAfterInsertXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocXmlAfterInsertXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocXmlBeforeDeleteXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocXmlBeforeDeleteXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocContentControlAfterInsertXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocContentControlAfterInsertXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocContentControlBeforeDeleteXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocContentControlBeforeDeleteXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocContentControlOnExistXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocContentControlOnExistXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocContentControlOnEnterXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocContentControlOnEnterXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocStoreUpdateXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocStoreUpdateXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocContentControlUpdateXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocContentControlUpdateXsdString());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.EventDocBuildingBlockAfterInsertXsdString.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.EventDocBuildingBlockAfterInsertXsdString());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.EventDocNewXsdString.ElementType, 0, 1),
@@ -2015,7 +2015,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.AllocatedCommandManifestEntry>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.AllocatedCommandManifestEntry.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.AllocatedCommandManifestEntry());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.AllocatedCommandManifestEntry.ElementType, 0, 0)
@@ -2255,7 +2255,7 @@ protected KeymapsType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.KeyMapEntry>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.KeyMapEntry.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.KeyMapEntry());
         }
     }
 
@@ -2314,8 +2314,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.AllocatedCommandManifest>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.ToolbarData>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.AllocatedCommandManifest.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.AllocatedCommandManifest());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.ToolbarData.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.ToolbarData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.AllocatedCommandManifest.ElementType, 0, 0),
@@ -2381,7 +2381,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.AllocatedCommand>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.AllocatedCommand.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.AllocatedCommand());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.AllocatedCommand.ElementType, 0, 0)
@@ -2540,8 +2540,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.RecordHashCode>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.RecordIncluded>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.RecordHashCode.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.RecordHashCode());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.RecordIncluded.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.RecordIncluded());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.Word.RecordIncluded.ElementType, 0, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordml.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordml.g.cs
index 86ca5db4b..515ccba15 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordml.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordml.g.cs
@@ -693,62 +693,62 @@ public StringValue? Id
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<RunTrackChangeType>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -1492,16 +1492,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Tint.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Shade.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.HueModulation());
             builder.AddElement<RgbColorModelHex>()
                 .AddAttribute("w14:val", a => a.Val, aBuilder =>
                 {
@@ -1611,16 +1611,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Tint.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Shade.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.HueModulation());
             builder.AddElement<SchemeColor>()
                 .AddAttribute("w14:val", a => a.Val, aBuilder =>
                 {
@@ -1787,7 +1787,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.FillToRectangle>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.FillToRectangle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.FillToRectangle());
             builder.AddElement<PathShadeProperties>()
                 .AddAttribute("w14:path", a => a.Path, aBuilder =>
                 {
@@ -2022,8 +2022,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1, version: FileFormatVersions.Office2010)
@@ -2124,9 +2124,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.GradientStopList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.LinearShadeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.PathShadeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.GradientStopList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.GradientStopList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.LinearShadeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.LinearShadeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.PathShadeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.PathShadeProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.GradientStopList.ElementType, 0, 1, version: FileFormatVersions.Office2010),
@@ -2326,8 +2326,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex());
             builder.AddElement<Glow>()
                 .AddAttribute("w14:rad", a => a.GlowRadius, aBuilder =>
                 {
@@ -2537,8 +2537,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex());
             builder.AddElement<Shadow>()
                 .AddAttribute("w14:blurRad", a => a.BlurRadius, aBuilder =>
                 {
@@ -2996,13 +2996,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NoFillEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RoundEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.BevelEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.GradientFillProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.LineJoinMiterProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.PresetLineDashProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SolidColorFillProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NoFillEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NoFillEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RoundEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RoundEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.BevelEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.BevelEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.GradientFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.GradientFillProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.LineJoinMiterProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.LineJoinMiterProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.PresetLineDashProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.PresetLineDashProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SolidColorFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SolidColorFillProperties());
             builder.AddElement<TextOutlineEffect>()
                 .AddAttribute("w14:w", a => a.LineWidth, aBuilder =>
                 {
@@ -3112,9 +3112,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NoFillEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.GradientFillProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SolidColorFillProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NoFillEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NoFillEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.GradientFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.GradientFillProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SolidColorFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SolidColorFillProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1, version: FileFormatVersions.Office2010)
@@ -3228,8 +3228,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Camera>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.LightRig>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Camera.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Camera());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.LightRig.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.LightRig());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.Camera.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -3364,10 +3364,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.BevelTop>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.BevelBottom>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ExtrusionColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ContourColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.BevelTop.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.BevelTop());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.BevelBottom.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.BevelBottom());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ExtrusionColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ExtrusionColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ContourColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ContourColor());
             builder.AddElement<Properties3D>()
                 .AddAttribute("w14:extrusionH", a => a.ExtrusionHeight, aBuilder =>
                 {
@@ -3654,7 +3654,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.StyleSet>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.StyleSet.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.StyleSet());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 0, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.StyleSet.ElementType, 0, 0, version: FileFormatVersions.Office2010)
@@ -3916,9 +3916,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Transform2D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.WordNonVisualContentPartShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Transform2D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.WordNonVisualContentPartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.WordNonVisualContentPartShapeProperties());
             builder.AddElement<ContentPart>()
                 .AddAttribute("w14:bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -4250,9 +4250,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Checked>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CheckedState>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.UncheckedState>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Checked.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Checked());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CheckedState.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CheckedState());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.UncheckedState.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.UncheckedState());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.Checked.ElementType, 0, 1, version: FileFormatVersions.Office2010),
@@ -4373,8 +4373,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex());
             builder.AddElement<GradientStop>()
                 .AddAttribute("w14:pos", a => a.StopPosition, aBuilder =>
                 {
@@ -4580,7 +4580,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.GradientStop>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.GradientStop.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.GradientStop());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.GradientStop.ElementType, 2, 10, version: FileFormatVersions.Office2010)
@@ -4812,7 +4812,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SphereCoordinates>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SphereCoordinates.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SphereCoordinates());
             builder.AddElement<LightRig>()
                 .AddAttribute("w14:rig", a => a.LightRigType, aBuilder =>
                 {
@@ -5192,8 +5192,8 @@ protected ColorType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RgbColorModelHex());
         }
 
         /// <summary>
@@ -5522,9 +5522,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -5654,8 +5654,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ContentPartLocks());
             builder.AddElement<NonVisualInkContentPartProperties>()
                 .AddAttribute("isComment", a => a.IsComment);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -5751,8 +5751,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NonVisualInkContentPartProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NonVisualInkContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NonVisualInkContentPartProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.NonVisualDrawingProperties.ElementType, 0, 1, version: FileFormatVersions.Office2010),
@@ -5876,8 +5876,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -5974,7 +5974,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingCanvas.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingCanvas.g.cs
index 9c600ee07..18057e65d 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingCanvas.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingCanvas.g.cs
@@ -83,14 +83,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.BackgroundFormatting>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.WholeFormatting>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Pictures.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.GraphicFrameType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.WordprocessingGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.BackgroundFormatting.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.BackgroundFormatting());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.WholeFormatting.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.WholeFormatting());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Pictures.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Pictures.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.GraphicFrameType.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.GraphicFrameType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.WordprocessingGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.WordprocessingGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.BackgroundFormatting.ElementType, 0, 1, version: FileFormatVersions.Office2010),
@@ -199,14 +199,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -293,9 +293,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Outline.ElementType, 0, 1),
@@ -386,11 +386,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGraphicFrameProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGraphicFrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGraphicFrameProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.Transform2D());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010),
@@ -525,7 +525,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingDrawing.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingDrawing.g.cs
index 08be6d204..8e00107fa 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingDrawing.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingDrawing.g.cs
@@ -172,7 +172,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentageWidth>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentageWidth.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentageWidth());
             builder.AddElement<RelativeWidth>()
                 .AddAttribute("relativeFrom", a => a.ObjectId, aBuilder =>
                 {
@@ -267,7 +267,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentageHeight>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentageHeight.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentageHeight());
             builder.AddElement<RelativeHeight>()
                 .AddAttribute("relativeFrom", a => a.RelativeFrom, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingGroup.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingGroup.g.cs
index 0a737cc9f..ad15ef7b2 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingGroup.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingGroup.g.cs
@@ -249,15 +249,15 @@ protected WordprocessingGroupType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGroupDrawingShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Pictures.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGroupDrawingShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGroupDrawingShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Pictures.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Pictures.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape());
         }
 
         /// <summary>
@@ -407,9 +407,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -529,8 +529,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicFrameLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicFrameLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, 0, 1),
@@ -654,8 +654,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -752,7 +752,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -825,8 +825,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, 0, 1),
@@ -939,17 +939,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TransformGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TransformGroup.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TransformGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<GroupShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -1059,11 +1059,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGraphicFrameProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGraphicFrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualGraphicFrameProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.Transform2D());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.NonVisualDrawingProperties.ElementType, 1, 1, version: FileFormatVersions.Office2010),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingShape.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingShape.g.cs
index 2cab3a11d..167c67c26 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingShape.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2010_wordprocessingShape.g.cs
@@ -91,15 +91,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualConnectorProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualDrawingShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.TextBodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.LinkedTextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.TextBoxInfo2>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualConnectorProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualConnectorProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualDrawingShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.NonVisualDrawingShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.TextBodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.TextBodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.LinkedTextBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.LinkedTextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.TextBoxInfo2.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.TextBoxInfo2());
             builder.AddElement<WordprocessingShape>()
                 .AddAttribute("normalEastAsianFlow", a => a.NormalEastAsianFlow);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -194,7 +194,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -318,9 +318,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -450,8 +450,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeLocks());
             builder.AddElement<NonVisualDrawingShapeProperties>()
                 .AddAttribute("txBox", a => a.TextBox);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -549,10 +549,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.StartConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EndConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.StartConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.StartConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EndConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EndConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, 0, 1),
@@ -697,21 +697,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -830,10 +830,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, 1, 1),
@@ -965,8 +965,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxContent>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxContent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxContent());
             builder.AddElement<TextBoxInfo2>()
                 .AddAttribute("id", a => a.Id);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1081,7 +1081,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.OfficeArtExtensionList());
             builder.AddElement<LinkedTextBox>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -1366,14 +1366,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FlatText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetTextWarp>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoAutoFit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NormalAutoFit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeAutoFit>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FlatText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FlatText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetTextWarp.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetTextWarp());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoAutoFit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NormalAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NormalAutoFit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeAutoFit());
             builder.AddElement<TextBodyProperties>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("spcFirstLastPara", a => a.UseParagraphSpacing)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2012_wordml.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2012_wordml.g.cs
index ac999f41c..93fc0e154 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2012_wordml.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2012_wordml.g.cs
@@ -304,7 +304,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.CommentEx>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.CommentEx.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.CommentEx());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Word.CommentEx.ElementType, 0, 0, version: FileFormatVersions.Office2013)
@@ -401,7 +401,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.Person>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.Person.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.Person());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Word.Person.ElementType, 0, 0, version: FileFormatVersions.Office2013)
@@ -499,8 +499,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.DoNotAllowInsertDeleteSection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.SectionTitle>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.DoNotAllowInsertDeleteSection.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.DoNotAllowInsertDeleteSection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.SectionTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.SectionTitle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2013.Word.SectionTitle.ElementType, 0, 1, version: FileFormatVersions.Office2013),
@@ -1020,7 +1020,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2013;
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.PresenceInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.PresenceInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.PresenceInfo());
             builder.AddElement<Person>()
                 .AddAttribute("w15:author", a => a.Author, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2016_wordml_cid.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2016_wordml_cid.g.cs
index 3e3e4c960..a66b8ffa4 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2016_wordml_cid.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2016_wordml_cid.g.cs
@@ -71,7 +71,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Word.Cid.CommentId>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Word.Cid.CommentId.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Word.Cid.CommentId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Word.Cid.CommentId.ElementType, 0, 0, version: FileFormatVersions.Office2019)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2018_wordml_cex.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2018_wordml_cex.g.cs
index bb1502f8a..1fa1a8a6a 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2018_wordml_cex.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_word_2018_wordml_cex.g.cs
@@ -73,8 +73,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Word.CommentsExt.CommentExtensible>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Word.CommentsExt.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Word.CommentsExt.CommentExtensible.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Word.CommentsExt.CommentExtensible());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Word.CommentsExt.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Word.CommentsExt.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Word.CommentsExt.CommentExtensible.ElementType, 0, 0, version: FileFormatVersions.Office2021),
@@ -211,7 +211,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Word.CommentsExt.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Word.CommentsExt.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Word.CommentsExt.ExtensionList());
             builder.AddElement<CommentExtensible>()
                 .AddAttribute("w16cex:durableId", a => a.DurableId, aBuilder =>
                 {
@@ -305,7 +305,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Word.ExtensionList.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Word.ExtensionList.Extension.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Word.ExtensionList.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2021.Word.ExtensionList.Extension.ElementType, 0, 0, version: FileFormatVersions.Office2021)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_chart.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_chart.g.cs
index 23216d252..8c29c40e6 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_chart.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_chart.g.cs
@@ -156,20 +156,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ChartShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -417,9 +417,9 @@ protected TextBodyType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
         }
 
         /// <summary>
@@ -1916,8 +1916,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ManualLayout>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ManualLayout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ManualLayout());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ManualLayout.ElementType, 0, 1),
@@ -2011,9 +2011,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RichText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringLiteral>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RichText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RichText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringLiteral.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringLiteral());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -2505,7 +2505,7 @@ protected ChartLinesType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
         }
 
         /// <summary>
@@ -2866,8 +2866,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumericValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumericValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumericValue());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -3017,20 +3017,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Smooth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Smooth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Smooth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3207,22 +3207,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowPercent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowLeaderLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LeaderLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DLblsExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Separator>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowValue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowPercent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowPercent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowLeaderLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowLeaderLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LeaderLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LeaderLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DLblsExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DLblsExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Separator.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Separator());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.DataLabel.ElementType, 0, 0),
@@ -3417,20 +3417,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3603,18 +3603,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3771,17 +3771,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Explosion>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Explosion.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Explosion());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -3948,15 +3948,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bubble3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bubble3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bubble3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -4152,7 +4152,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BandFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BandFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BandFormat());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.BandFormat.ElementType, 0, 0)
@@ -4221,11 +4221,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MaxAxisValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinAxisValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LogBase>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Orientation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MaxAxisValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MaxAxisValue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinAxisValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinAxisValue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LogBase.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LogBase());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Orientation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Orientation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.LogBase.ElementType, 0, 1),
@@ -4409,12 +4409,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Overlay>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartText>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Overlay.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Overlay());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartText());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ChartText.ElementType, 0, 1),
@@ -5198,21 +5198,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ColorMapOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Date1904>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RoundedCorners>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Chart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartSpaceExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExternalData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PivotSource>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PrintSettings>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Protection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.UserShapesReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Style>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.EditingLanguage>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.Style>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ColorMapOverride.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ColorMapOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Date1904.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Date1904());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RoundedCorners.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RoundedCorners());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Chart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Chart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartSpaceExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartSpaceExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExternalData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExternalData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PivotSource.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PivotSource());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PrintSettings.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PrintSettings());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Protection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Protection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.UserShapesReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.UserShapesReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Style.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Style());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.EditingLanguage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.EditingLanguage());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.Style.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.Style());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Date1904.ElementType, 0, 1),
@@ -5365,8 +5365,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.AbsoluteAnchorSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.RelativeAnchorSize>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.AbsoluteAnchorSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.AbsoluteAnchorSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.RelativeAnchorSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.RelativeAnchorSize());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -6084,7 +6084,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumericValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumericValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumericValue());
             builder.AddElement<NumericPoint>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -6170,7 +6170,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Extension.ElementType, 0, 0)
@@ -6237,9 +6237,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingCache>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumRefExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingCache.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingCache());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumRefExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumRefExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Formula.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Formula());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Formula.ElementType, 1, 1),
@@ -6487,10 +6487,10 @@ protected NumberDataType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumericPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PointCount>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.FormatCode>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumericPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumericPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PointCount());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.FormatCode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.FormatCode());
         }
 
         /// <summary>
@@ -6574,7 +6574,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringPoint>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringPoint());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.StringPoint.ElementType, 0, 0)
@@ -6641,9 +6641,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringCache>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MultiLvlStrRefExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringCache.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringCache());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MultiLvlStrRefExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MultiLvlStrRefExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Formula.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Formula());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Formula.ElementType, 1, 1),
@@ -6751,9 +6751,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringCache>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StrRefExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringCache.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringCache());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StrRefExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StrRefExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Formula.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Formula());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Formula.ElementType, 1, 1),
@@ -6996,9 +6996,9 @@ protected StringDataType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PointCount>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StrDataExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PointCount());
         }
 
         /// <summary>
@@ -7278,16 +7278,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Left>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Top>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Width>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Height>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LeftMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TopMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.WidthMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.HeightMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LayoutTarget>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Left.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Left());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Top.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Top());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Width.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Width());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Height.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Height());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LeftMode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LeftMode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TopMode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TopMode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.WidthMode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.WidthMode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.HeightMode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.HeightMode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LayoutTarget.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LayoutTarget());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.LayoutTarget.ElementType, 0, 1),
@@ -7809,10 +7809,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Size>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Symbol>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Size.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Size());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Symbol.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Symbol());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Symbol.ElementType, 0, 1),
@@ -7936,11 +7936,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ApplyToFront>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ApplyToSides>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ApplyToEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureStackUnit>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ApplyToFront.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ApplyToFront());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ApplyToSides.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ApplyToSides());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ApplyToEnd.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ApplyToEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureStackUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureStackUnit());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ApplyToFront.ElementType, 0, 1),
@@ -8214,12 +8214,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartText>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartText());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, 0, 1),
@@ -8847,8 +8847,8 @@ protected NumberDataSourceType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberReference());
         }
 
         /// <summary>
@@ -9160,7 +9160,7 @@ protected UpDownBarType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
         }
 
         /// <summary>
@@ -9321,7 +9321,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SecondPiePoint>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SecondPiePoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SecondPiePoint());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.SecondPiePoint.ElementType, 0, 0)
@@ -9432,8 +9432,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, 1, 1),
@@ -9661,10 +9661,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartText>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartText());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, 0, 1),
@@ -9876,11 +9876,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, 1, 1),
@@ -10059,10 +10059,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, 1, 1),
@@ -10187,12 +10187,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.OddHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.OddFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.EvenHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.EvenFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.FirstHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.FirstFooter>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.OddHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.OddHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.OddFooter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.OddFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.EvenHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.EvenHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.EvenFooter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.EvenFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.FirstHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.FirstHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.FirstFooter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.FirstFooter());
             builder.AddElement<HeaderFooter>()
                 .AddAttribute("alignWithMargins", a => a.AlignWithMargins)
                 .AddAttribute("differentOddEven", a => a.DifferentOddEven)
@@ -10621,21 +10621,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -10765,22 +10765,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowPercent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Separator>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowLegendKey());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowValue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowCategoryName());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowSeriesName());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowPercent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowPercent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowBubbleSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DLblExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabelPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Separator.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Separator());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, 1, 1),
@@ -10894,13 +10894,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AreaChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AreaChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DropLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Grouping>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AreaChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AreaChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AreaChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AreaChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DropLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DropLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Grouping.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Grouping());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -11010,14 +11010,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Area3DChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AreaChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DropLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.GapDepth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Grouping>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Area3DChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Area3DChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AreaChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AreaChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DropLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DropLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.GapDepth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.GapDepth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Grouping.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Grouping());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -11131,17 +11131,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowMarker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Smooth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DropLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.HighLowLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Grouping>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.UpDownBars>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowMarker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowMarker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Smooth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Smooth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DropLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DropLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.HighLowLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.HighLowLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Grouping.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Grouping());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.UpDownBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.UpDownBars());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -11255,14 +11255,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DropLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.GapDepth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Grouping>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Line3DChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DropLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DropLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.GapDepth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.GapDepth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Grouping.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Grouping());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Line3DChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Line3DChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -11372,13 +11372,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DropLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.HighLowLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StockChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.UpDownBars>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DropLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DropLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.HighLowLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.HighLowLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StockChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StockChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.UpDownBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.UpDownBars());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.LineChartSeries.ElementType, 3, 4),
@@ -11454,12 +11454,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RadarChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RadarChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RadarStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RadarChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RadarChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RadarChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RadarChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RadarStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RadarStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.RadarStyle.ElementType, 1, 1),
@@ -11560,12 +11560,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ScatterChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ScatterChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ScatterStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ScatterChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ScatterChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ScatterChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ScatterChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ScatterStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ScatterStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ScatterStyle.ElementType, 1, 1),
@@ -11665,11 +11665,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.FirstSliceAngle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.FirstSliceAngle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.FirstSliceAngle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -11760,10 +11760,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Pie3DChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Pie3DChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Pie3DChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -11855,12 +11855,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.FirstSliceAngle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.HoleSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.FirstSliceAngle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.FirstSliceAngle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.HoleSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.HoleSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -11958,16 +11958,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarDirection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarGrouping>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.GapWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Overlap>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarDirection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarDirection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarGrouping.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarGrouping());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.GapWidth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.GapWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Overlap.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Overlap());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -12095,16 +12095,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bar3DChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarDirection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarGrouping>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.GapWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.GapDepth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bar3DChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bar3DChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarDirection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarDirection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarGrouping.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarGrouping());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.GapWidth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.GapWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.GapDepth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.GapDepth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -12233,17 +12233,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CustomSplit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SplitPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.GapWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.OfPieType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SecondPieSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SplitType>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesLines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CustomSplit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CustomSplit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SplitPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SplitPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.GapWidth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.GapWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.OfPieType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.OfPieType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SecondPieSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SecondPieSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SplitType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SplitType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.OfPieType.ElementType, 1, 1),
@@ -12354,11 +12354,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BandFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Wireframe>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BandFormats.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BandFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Wireframe.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Wireframe());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -12451,12 +12451,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BandFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Wireframe>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Surface3DChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BandFormats.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BandFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Wireframe.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Wireframe());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Surface3DChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Surface3DChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Wireframe.ElementType, 0, 1),
@@ -12560,15 +12560,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.VaryColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bubble3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowNegativeBubbles>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleChartSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SizeRepresents>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.VaryColors());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bubble3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bubble3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowNegativeBubbles.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowNegativeBubbles());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleScale.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleScale());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleChartSeries.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleChartSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SizeRepresents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SizeRepresents());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.VaryColors.ElementType, 0, 1),
@@ -12674,27 +12674,27 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossBetween>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Crosses>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DisplayUnits>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossesAt>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Scaling>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Title>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ValAxExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossBetween.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossBetween());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Crosses.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Crosses());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DisplayUnits.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DisplayUnits());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossesAt.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossesAt());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Scaling.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Scaling());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Title.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Title());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ValAxExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ValAxExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -12992,29 +12992,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AutoLabeled>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NoMultiLevelLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CatAxExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Crosses>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossesAt>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LabelAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LabelOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Scaling>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TickLabelSkip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TickMarkSkip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Title>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AutoLabeled.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AutoLabeled());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NoMultiLevelLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NoMultiLevelLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CatAxExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CatAxExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Crosses.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Crosses());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossesAt.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossesAt());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LabelAlignment.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LabelAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LabelOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LabelOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Scaling.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Scaling());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TickLabelSkip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TickLabelSkip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TickMarkSkip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TickMarkSkip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Title.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Title());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -13315,30 +13315,30 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AutoLabeled>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Crosses>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DateAxExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossesAt>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LabelOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Scaling>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BaseTimeUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorTimeUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorTimeUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Title>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AutoLabeled.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AutoLabeled());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Crosses.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Crosses());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DateAxExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DateAxExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossesAt.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossesAt());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LabelOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LabelOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Scaling.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Scaling());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BaseTimeUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BaseTimeUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorTimeUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorTimeUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorTimeUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorTimeUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Title.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Title());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -13635,25 +13635,25 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Delete>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Crosses>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossesAt>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Scaling>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SerAxExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TickLabelSkip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TickMarkSkip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Title>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AxisId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Delete.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Delete());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorGridlines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Crosses.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Crosses());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossesAt.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossesAt());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Scaling.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Scaling());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SerAxExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SerAxExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TickLabelSkip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TickLabelSkip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TickMarkSkip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TickMarkSkip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TickLabelPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MajorTickMark());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MinorTickMark());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Title.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Title());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AxisId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AxisId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CrossingAxis());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -13933,13 +13933,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowHorizontalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowVerticalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowOutlineBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowKeys>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowHorizontalBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowHorizontalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowVerticalBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowVerticalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowOutlineBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowOutlineBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowKeys.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowKeys());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ShowHorizontalBorder.ElementType, 0, 1),
@@ -14202,7 +14202,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumericValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumericValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumericValue());
             builder.AddElement<StringPoint>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -14342,7 +14342,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension());
             builder.AddElement<StockChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -14424,7 +14424,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries());
             builder.AddElement<PieChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -14506,7 +14506,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries());
             builder.AddElement<Pie3DChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -14590,9 +14590,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference());
             builder.AddElement<NumRefExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -14676,7 +14676,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.AutoGeneneratedCategories>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.AutoGeneneratedCategories.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.AutoGeneneratedCategories());
             builder.AddElement<StrDataExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -14760,9 +14760,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference());
             builder.AddElement<StrRefExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -14848,9 +14848,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference());
             builder.AddElement<MultiLvlStrRefExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -14940,13 +14940,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowLeaderLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.LeaderLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowLeaderLines.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowLeaderLines());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.LeaderLines.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.LeaderLines());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable());
             builder.AddElement<DLblsExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15034,7 +15034,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension());
             builder.AddElement<LineChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15116,7 +15116,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension());
             builder.AddElement<Line3DChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15198,7 +15198,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredScatterSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredScatterSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredScatterSeries());
             builder.AddElement<ScatterChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15280,7 +15280,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredRadarSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredRadarSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredRadarSeries());
             builder.AddElement<RadarChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15362,7 +15362,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries());
             builder.AddElement<BarChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15444,7 +15444,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries());
             builder.AddElement<Bar3DChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15526,7 +15526,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries());
             builder.AddElement<AreaChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15608,7 +15608,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries());
             builder.AddElement<Area3DChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15690,7 +15690,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBubbleSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBubbleSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBubbleSeries());
             builder.AddElement<BubbleChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15772,7 +15772,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries());
             builder.AddElement<SurfaceChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15854,7 +15854,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries());
             builder.AddElement<Surface3DChartExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -15936,7 +15936,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat());
             builder.AddElement<CatAxExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -16018,7 +16018,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat());
             builder.AddElement<DateAxExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -16100,7 +16100,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat());
             builder.AddElement<SerAxExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -16182,7 +16182,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat());
             builder.AddElement<ValAxExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -16257,10 +16257,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.GapWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.UpBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DownBars>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.GapWidth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.GapWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.UpBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.UpBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DownBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DownBars());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.GapWidth.ElementType, 0, 1),
@@ -16380,7 +16380,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StockChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StockChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StockChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.StockChartExtension.ElementType, 0, 0)
@@ -16445,7 +16445,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PieChartExtension.ElementType, 0, 0)
@@ -16510,7 +16510,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Pie3DChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Pie3DChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Pie3DChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Pie3DChartExtension.ElementType, 0, 0)
@@ -16575,7 +16575,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumRefExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumRefExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumRefExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.NumRefExtension.ElementType, 0, 0)
@@ -16640,7 +16640,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StrDataExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StrDataExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StrDataExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.StrDataExtension.ElementType, 0, 0)
@@ -16705,7 +16705,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StrRefExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StrRefExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StrRefExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.StrRefExtension.ElementType, 0, 0)
@@ -16772,9 +16772,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Level>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PointCount>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Level.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Level());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PointCount());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PointCount.ElementType, 0, 1),
@@ -16854,7 +16854,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MultiLvlStrRefExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MultiLvlStrRefExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MultiLvlStrRefExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.MultiLvlStrRefExtension.ElementType, 0, 0)
@@ -16919,7 +16919,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DLblsExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DLblsExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DLblsExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.DLblsExtension.ElementType, 0, 0)
@@ -16984,7 +16984,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.LineChartExtension.ElementType, 0, 0)
@@ -17049,7 +17049,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Line3DChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Line3DChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Line3DChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Line3DChartExtension.ElementType, 0, 0)
@@ -17168,19 +17168,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.XValues>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Smooth>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.YValues>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.XValues.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.XValues());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Smooth.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Smooth());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.YValues.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.YValues());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -17328,7 +17328,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ScatterChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ScatterChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ScatterChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ScatterChartExtension.ElementType, 0, 0)
@@ -17448,17 +17448,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Values>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxisData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Values.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Values());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -17617,7 +17617,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RadarChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RadarChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RadarChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.RadarChartExtension.ElementType, 0, 0)
@@ -17727,7 +17727,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.BarChartExtension.ElementType, 0, 0)
@@ -17834,7 +17834,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bar3DChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bar3DChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bar3DChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Bar3DChartExtension.ElementType, 0, 0)
@@ -17899,7 +17899,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AreaChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AreaChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AreaChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.AreaChartExtension.ElementType, 0, 0)
@@ -17964,7 +17964,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Area3DChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Area3DChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Area3DChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Area3DChartExtension.ElementType, 0, 0)
@@ -18043,21 +18043,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.XValues>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bubble3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataLabels>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBars>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.YValues>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Trendline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Order>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.XValues.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.XValues());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bubble3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bubble3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataLabels.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataLabels());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBars.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBars());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.YValues.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.YValues());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleSize.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleSize());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Trendline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Trendline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Order.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Order());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -18307,7 +18307,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.BubbleChartExtension.ElementType, 0, 0)
@@ -18372,7 +18372,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.SurfaceChartExtension.ElementType, 0, 0)
@@ -18437,7 +18437,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Surface3DChartExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Surface3DChartExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Surface3DChartExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Surface3DChartExtension.ElementType, 0, 0)
@@ -18694,7 +18694,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CatAxExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CatAxExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CatAxExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.CatAxExtension.ElementType, 0, 0)
@@ -18989,7 +18989,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DateAxExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DateAxExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DateAxExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.DateAxExtension.ElementType, 0, 0)
@@ -19054,7 +19054,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SerAxExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SerAxExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SerAxExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.SerAxExtension.ElementType, 0, 0)
@@ -19167,10 +19167,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BuiltInUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DisplayUnitsLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CustomDisplayUnit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BuiltInUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BuiltInUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DisplayUnitsLabel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DisplayUnitsLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CustomDisplayUnit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CustomDisplayUnit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -19241,7 +19241,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ValAxExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ValAxExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ValAxExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ValAxExtension.ElementType, 0, 0)
@@ -19516,7 +19516,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<ColorMapOverride>()
                 .AddAttribute("bg1", a => a.Background1, aBuilder =>
                 {
@@ -19657,9 +19657,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.FormatId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PivotTableName>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.FormatId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.FormatId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PivotTableName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PivotTableName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PivotTableName.ElementType, 1, 1),
@@ -19769,11 +19769,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Data>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Formatting>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Selection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.UserInterface>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartObject.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartObject());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Data.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Data());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Formatting.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Formatting());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Selection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Selection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.UserInterface.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.UserInterface());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ChartObject.ElementType, 0, 1),
@@ -19919,19 +19919,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AutoTitleDeleted>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PlotVisibleOnly>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShowDataLabelsOverMaximum>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DisplayBlanksAs>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Legend>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PivotFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PlotArea>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Floor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SideWall>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BackWall>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Title>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.View3D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AutoTitleDeleted.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AutoTitleDeleted());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PlotVisibleOnly.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PlotVisibleOnly());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShowDataLabelsOverMaximum.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShowDataLabelsOverMaximum());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DisplayBlanksAs.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DisplayBlanksAs());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Legend.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Legend());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PivotFormats.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PivotFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PlotArea.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PlotArea());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Floor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Floor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SideWall.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SideWall());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BackWall.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BackWall());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Title.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Title());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.View3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.View3D());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Title.ElementType, 0, 1),
@@ -20191,7 +20191,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AutoUpdate>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AutoUpdate.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AutoUpdate());
             builder.AddElement<ExternalData>()
                 .AddAttribute("r:id", a => a.Id, aBuilder =>
                 {
@@ -20278,10 +20278,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PageMargins>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PageSetup>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LegacyDrawingHeaderFooter>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PageMargins.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PageMargins());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PageSetup.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PageSetup());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LegacyDrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LegacyDrawingHeaderFooter());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.HeaderFooter.ElementType, 0, 1),
@@ -20401,7 +20401,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartSpaceExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartSpaceExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartSpaceExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ChartSpaceExtension.ElementType, 0, 0)
@@ -20478,9 +20478,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.PivotSource>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.PivotOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.SketchOptions>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.PivotSource.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.PivotSource());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.PivotOptions.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.PivotOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.SketchOptions.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.SketchOptions());
             builder.AddElement<ChartSpaceExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -20554,7 +20554,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DLblExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DLblExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DLblExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.DLblExtension.ElementType, 0, 0)
@@ -20634,12 +20634,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ExceptionForSave>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ExceptionForSave.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ExceptionForSave());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<DLblExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -20723,14 +20723,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bubble3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Index>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Explosion>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.InvertIfNegative());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bubble3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bubble3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Index());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Explosion.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Explosion());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Index.ElementType, 1, 1),
@@ -20917,18 +20917,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DisplayRSquaredValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DisplayEquation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Forward>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Backward>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Intercept>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PolynomialOrder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Period>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TrendlineLabel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TrendlineType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TrendlineName>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DisplayRSquaredValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DisplayRSquaredValue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DisplayEquation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DisplayEquation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Forward.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Forward());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Backward.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Backward());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Intercept.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Intercept());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PolynomialOrder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PolynomialOrder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Period.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Period());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TrendlineLabel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TrendlineLabel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TrendlineType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TrendlineType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TrendlineName.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TrendlineName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.TrendlineName.ElementType, 0, 1),
@@ -21168,15 +21168,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NoEndCap>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBarValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBarType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorDirection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ErrorBarValueType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Plus>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Minus>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NoEndCap.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NoEndCap());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBarValue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBarValue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBarType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBarType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorDirection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorDirection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ErrorBarValueType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ErrorBarValueType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Plus.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Plus());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Minus.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Minus());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ErrorDirection.ElementType, 0, 1),
@@ -21519,11 +21519,11 @@ protected AxisDataSourceType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.NumberReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringLiteral>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StringReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.MultiLevelStringReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberLiteral());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.NumberReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.NumberReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringLiteral.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringLiteral());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StringReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StringReference());
         }
 
         /// <summary>
@@ -21646,7 +21646,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineSerExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineSerExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineSerExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.LineSerExtension.ElementType, 0, 0)
@@ -21727,13 +21727,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<LineSerExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -21811,7 +21811,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.ScatterSerExtension.ElementType, 0, 0)
@@ -21892,13 +21892,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<ScatterSerExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -21976,7 +21976,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.RadarSerExtension.ElementType, 0, 0)
@@ -22057,13 +22057,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<RadarSerExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -22141,7 +22141,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarSerExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarSerExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarSerExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.BarSerExtension.ElementType, 0, 0)
@@ -22223,14 +22223,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<BarSerExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -22309,7 +22309,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.AreaSerExtension.ElementType, 0, 0)
@@ -22390,13 +22390,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<AreaSerExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -22474,7 +22474,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieSerExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieSerExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieSerExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PieSerExtension.ElementType, 0, 0)
@@ -22555,13 +22555,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<PieSerExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -22639,7 +22639,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.BubbleSerExtension.ElementType, 0, 0)
@@ -22720,13 +22720,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<BubbleSerExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -22804,7 +22804,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.SurfaceSerExtension.ElementType, 0, 0)
@@ -22884,12 +22884,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
             builder.AddElement<SurfaceSerExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -22967,7 +22967,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2019;
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Chart.BooleanFalse>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Chart.BooleanFalse.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Chart.BooleanFalse());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office2019.Drawing.Chart.BooleanFalse.ElementType, 0, 1, version: FileFormatVersions.Office2019)
@@ -23045,7 +23045,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PivotFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PivotFormat.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PivotFormat());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.PivotFormat.ElementType, 0, 0)
@@ -23116,13 +23116,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RightAngleAxes>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DepthPercent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.HeightPercent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Perspective>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RotateX>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RotateY>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RightAngleAxes.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RightAngleAxes());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DepthPercent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DepthPercent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.HeightPercent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.HeightPercent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Perspective.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Perspective());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RotateX.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RotateX());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RotateY.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RotateY());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.RotateX.ElementType, 0, 1),
@@ -23496,10 +23496,10 @@ protected SurfaceType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PictureOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Thickness>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PictureOptions.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PictureOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Thickness.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Thickness());
         }
 
         /// <summary>
@@ -23632,30 +23632,30 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Area3DChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.AreaChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Bar3DChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BarChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.BubbleChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.CategoryAxis>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DateAxis>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DoughnutChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Line3DChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LineChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.OfPieChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Pie3DChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.PieChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.RadarChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ScatterChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SeriesAxis>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.StockChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Surface3DChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.SurfaceChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ValueAxis>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Area3DChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Area3DChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.AreaChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.AreaChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Bar3DChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Bar3DChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BarChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BarChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.BubbleChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.BubbleChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.CategoryAxis.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.CategoryAxis());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DateAxis.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DateAxis());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DoughnutChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DoughnutChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataTable.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataTable());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Line3DChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Line3DChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LineChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LineChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.OfPieChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.OfPieChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Pie3DChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Pie3DChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.PieChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.PieChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.RadarChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.RadarChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ScatterChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ScatterChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SeriesAxis.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SeriesAxis());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.StockChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.StockChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Surface3DChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Surface3DChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.SurfaceChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.SurfaceChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ValueAxis.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ValueAxis());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, 0, 1),
@@ -23768,13 +23768,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Overlay>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LegendEntry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.LegendPosition>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Overlay.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Overlay());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.Layout.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LegendEntry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LegendEntry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.LegendPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.LegendPosition());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.LegendPosition.ElementType, 0, 1),
@@ -23900,7 +23900,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.DataDisplayOptions16>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.DataDisplayOptions16.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.DataDisplayOptions16());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Charts.DataDisplayOptions16.ElementType, 0, 0, version: FileFormatVersions.Office2019)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_chartDrawing.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_chartDrawing.g.cs
index 223107008..b62458915 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_chartDrawing.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_chartDrawing.g.cs
@@ -80,14 +80,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.FromAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.ToAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.FromAnchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.FromAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.ToAnchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.ToAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ChartDrawing.FromAnchor.ElementType, 1, 1),
@@ -201,14 +201,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Extent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.FromAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Extent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Extent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.FromAnchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.FromAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ChartDrawing.FromAnchor.ElementType, 1, 1),
@@ -358,10 +358,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Style>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.TextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Style.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Style());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.TextBody.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.TextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualShapeProperties());
             builder.AddElement<Shape>()
                 .AddAttribute("macro", a => a.Macro)
                 .AddAttribute("textlink", a => a.TextLink)
@@ -494,14 +494,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGroupShapeProperties.ElementType, 1, 1),
@@ -624,9 +624,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Transform>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGraphicFrameProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Transform.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Transform());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGraphicFrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGraphicFrameProperties());
             builder.AddElement<GraphicFrame>()
                 .AddAttribute("macro", a => a.Macro)
                 .AddAttribute("fPublished", a => a.Published);
@@ -758,9 +758,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Style>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualConnectorShapeDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Style.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Style());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualConnectorShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualConnectorShapeDrawingProperties());
             builder.AddElement<ConnectionShape>()
                 .AddAttribute("macro", a => a.Macro)
                 .AddAttribute("fPublished", a => a.Published);
@@ -893,10 +893,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.Style>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualPictureProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.Style.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.Style());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualPictureProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualPictureProperties());
             builder.AddElement<Picture>()
                 .AddAttribute("macro", a => a.Macro)
                 .AddAttribute("fPublished", a => a.Published);
@@ -1072,9 +1072,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -1204,8 +1204,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeLocks());
             builder.AddElement<NonVisualShapeDrawingProperties>()
                 .AddAttribute("txBox", a => a.TextBox);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1300,8 +1300,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualShapeDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualShapeDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -1417,21 +1417,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -1549,10 +1549,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, 1, 1),
@@ -1674,9 +1674,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, 1, 1),
@@ -1772,10 +1772,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.StartConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EndConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.StartConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.StartConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EndConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EndConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, 0, 1),
@@ -1896,8 +1896,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualConnectionShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualConnectionShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualConnectionShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -2000,8 +2000,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PictureLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PictureLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PictureLocks());
             builder.AddElement<NonVisualPictureDrawingProperties>()
                 .AddAttribute("preferRelativeResize", a => a.PreferRelativeResize);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2096,8 +2096,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualPictureDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualPictureDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualPictureDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -2212,10 +2212,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SourceRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Stretch>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tile>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SourceRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SourceRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Stretch.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Stretch());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tile());
             builder.AddElement<BlipFill>()
                 .AddAttribute("dpi", a => a.Dpi)
                 .AddAttribute("rotWithShape", a => a.RotateWithShape);
@@ -2319,8 +2319,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicFrameLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicFrameLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, 0, 1),
@@ -2413,8 +2413,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGraphicFrameDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGraphicFrameDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGraphicFrameDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -2537,8 +2537,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -2635,8 +2635,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, 0, 1),
@@ -2948,8 +2948,8 @@ protected MarkerType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.XPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.YPosition>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.XPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.XPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.YPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.YPosition());
         }
 
         /// <summary>
@@ -3095,8 +3095,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGroupShapeDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGroupShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualGroupShapeDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ChartDrawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -3208,17 +3208,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TransformGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TransformGroup.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TransformGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<GroupShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_diagram.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_diagram.g.cs
index 185952fe0..906a9bf9c 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_diagram.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_diagram.g.cs
@@ -97,11 +97,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategories>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformDescription>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorDefinitionTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformStyleLabel>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategories.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategories());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformDescription.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformDescription());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorDefinitionTitle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorDefinitionTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformStyleLabel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformStyleLabel());
             builder.AddElement<ColorsDefinition>()
                 .AddAttribute("uniqueId", a => a.UniqueId)
                 .AddAttribute("minVer", a => a.MinVersion);
@@ -238,10 +238,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategories>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformDescription>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorDefinitionTitle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategories.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategories());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformDescription.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformDescription());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorDefinitionTitle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorDefinitionTitle());
             builder.AddElement<ColorsDefinitionHeader>()
                 .AddAttribute("uniqueId", a => a.UniqueId, aBuilder =>
                 {
@@ -316,7 +316,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeader>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeader());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeader.ElementType, 0, 0)
@@ -385,11 +385,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Background>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.DataModelExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Whole>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ConnectionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PointList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Background.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Background());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.DataModelExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.DataModelExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Whole.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Whole());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ConnectionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ConnectionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PointList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PointList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.PointList.ElementType, 1, 1),
@@ -591,14 +591,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.CategoryList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Description>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.DiagramDefinitionExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Title>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.SampleData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorData>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.CategoryList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.CategoryList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Description.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Description());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.DiagramDefinitionExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.DiagramDefinitionExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Title.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Title());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.SampleData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.SampleData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorData());
             builder.AddElement<LayoutDefinition>()
                 .AddAttribute("uniqueId", a => a.UniqueId)
                 .AddAttribute("minVer", a => a.MinVersion)
@@ -748,10 +748,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.CategoryList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Description>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Title>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.CategoryList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.CategoryList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Description.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Description());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Title.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Title());
             builder.AddElement<LayoutDefinitionHeader>()
                 .AddAttribute("uniqueId", a => a.UniqueId, aBuilder =>
                 {
@@ -827,7 +827,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeader>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeader());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeader.ElementType, 0, 0)
@@ -1021,12 +1021,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Scene3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategories>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabelDescription>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabel>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Scene3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Scene3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategories.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategories());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabelDescription.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabelDescription());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionTitle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabel());
             builder.AddElement<StyleDefinition>()
                 .AddAttribute("uniqueId", a => a.UniqueId)
                 .AddAttribute("minVer", a => a.MinVersion);
@@ -1163,10 +1163,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategories>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabelDescription>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionTitle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategories.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategories());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabelDescription.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleLabelDescription());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionTitle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionTitle());
             builder.AddElement<StyleDefinitionHeader>()
                 .AddAttribute("uniqueId", a => a.UniqueId, aBuilder =>
                 {
@@ -1241,7 +1241,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeader>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeader());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeader.ElementType, 0, 0)
@@ -1870,12 +1870,12 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.Diagrams.HueDirectionValues>? Hu
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<ColorsType>()
                 .AddAttribute("meth", a => a.Method, aBuilder =>
                 {
@@ -1942,7 +1942,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -2125,7 +2125,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategory>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategory.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategory());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 0, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.ColorTransformCategory.ElementType, 0, 0)
@@ -2206,13 +2206,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.FillColorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LineColorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.EffectColorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.TextLineColorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.TextFillColorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.TextEffectColorList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.FillColorList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.FillColorList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LineColorList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LineColorList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.EffectColorList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.EffectColorList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.TextLineColorList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.TextLineColorList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.TextFillColorList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.TextFillColorList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.TextEffectColorList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.TextEffectColorList());
             builder.AddElement<ColorTransformStyleLabel>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -2412,10 +2412,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.TextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PropertySet>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.TextBody.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.TextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PropertySet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PropertySet());
             builder.AddElement<Point>()
                 .AddAttribute("modelId", a => a.ModelId, aBuilder =>
                 {
@@ -2647,7 +2647,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
             builder.AddElement<Connection>()
                 .AddAttribute("modelId", a => a.ModelId, aBuilder =>
                 {
@@ -2894,7 +2894,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
             builder.AddElement<Constraint>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -3076,7 +3076,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
             builder.AddElement<Rule>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -3232,7 +3232,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Adjust>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Adjust.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Adjust());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.Adjust.ElementType, 0, 0)
@@ -3416,8 +3416,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Parameter>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Parameter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Parameter());
             builder.AddElement<Algorithm>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -3564,8 +3564,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.AdjustList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.AdjustList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.AdjustList());
             builder.AddElement<Shape>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("type", a => a.Type, aBuilder =>
@@ -3734,7 +3734,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
             builder.AddElement<PresentationOf>()
                 .AddAttribute("axis", a => a.Axis)
                 .AddAttribute("ptType", a => a.PointType)
@@ -3819,7 +3819,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Constraint>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Constraint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Constraint());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.Constraint.ElementType, 0, 0)
@@ -3884,7 +3884,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Rule>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Rule.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Rule());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.Rule.ElementType, 0, 0)
@@ -4116,15 +4116,15 @@ protected LayoutVariablePropertySetType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.AnimationLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.AnimateOneByOne>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.BulletEnabled>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.MaxNumberOfChildren>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PreferredNumberOfChildren>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Direction>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.HierarchyBranch>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.OrganizationChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ResizeHandles>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.AnimationLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.AnimationLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.AnimateOneByOne.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.AnimateOneByOne());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.BulletEnabled.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.BulletEnabled());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.MaxNumberOfChildren.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.MaxNumberOfChildren());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PreferredNumberOfChildren.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PreferredNumberOfChildren());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Direction.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Direction());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.HierarchyBranch.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.HierarchyBranch());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.OrganizationChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.OrganizationChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ResizeHandles.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ResizeHandles());
         }
 
         /// <summary>
@@ -4387,15 +4387,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Choose>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Constraints>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ForEach>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.RuleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Shape>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Choose.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Choose());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Constraints.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Constraints());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ForEach.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ForEach());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.RuleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.RuleList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Shape());
             builder.AddElement<ForEach>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("ref", a => a.Reference)
@@ -4527,16 +4527,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Choose>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Constraints>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ForEach>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.VariableList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.RuleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Shape>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Choose.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Choose());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Constraints.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Constraints());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ForEach.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ForEach());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.VariableList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.VariableList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.RuleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.RuleList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Shape());
             builder.AddElement<LayoutNode>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("styleLbl", a => a.StyleLabel)
@@ -4630,8 +4630,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.DiagramChooseElse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.DiagramChooseIf>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.DiagramChooseElse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.DiagramChooseElse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.DiagramChooseIf.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.DiagramChooseIf());
             builder.AddElement<Choose>()
                 .AddAttribute("name", a => a.Name);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -4818,15 +4818,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Choose>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Constraints>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ForEach>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.RuleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Shape>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Choose.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Choose());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Constraints.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Constraints());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ForEach.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ForEach());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.RuleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.RuleList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Shape());
             builder.AddElement<DiagramChooseIf>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("axis", a => a.Axis)
@@ -4957,15 +4957,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Choose>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Constraints>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ForEach>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.RuleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Shape>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Algorithm());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Choose.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Choose());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Constraints.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Constraints());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ForEach.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ForEach());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutNode());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PresentationOf());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.RuleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.RuleList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Shape());
             builder.AddElement<DiagramChooseElse>()
                 .AddAttribute("name", a => a.Name);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
@@ -5045,11 +5045,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Background>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.DataModelExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Whole>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ConnectionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PointList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Background.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Background());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.DataModelExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.DataModelExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Whole.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Whole());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ConnectionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ConnectionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PointList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PointList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.PointList.ElementType, 1, 1),
@@ -5355,7 +5355,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Category>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Category.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Category());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.Category.ElementType, 0, 0)
@@ -5423,10 +5423,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, 1, 1),
@@ -6008,10 +6008,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Backdrop>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Camera>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LightRig>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Backdrop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Backdrop());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Camera.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Camera());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LightRig.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LightRig());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Camera.ElementType, 1, 1),
@@ -6175,11 +6175,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BevelTop>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BevelBottom>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtrusionColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ContourColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BevelTop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BevelTop());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BevelBottom.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BevelBottom());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtrusionColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtrusionColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ContourColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ContourColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<Shape3D>()
                 .AddAttribute("z", a => a.Z, aBuilder =>
                 {
@@ -6331,8 +6331,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FlatText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FlatText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FlatText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -6542,7 +6542,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategory>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategory.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategory());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 0, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDisplayCategory.ElementType, 0, 0)
@@ -6621,11 +6621,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Scene3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Shape3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Style>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.TextProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Scene3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Scene3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Shape3D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Shape3D());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Style.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Style());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.TextProperties());
             builder.AddElement<StyleLabel>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -6764,7 +6764,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Point>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Point.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Point());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.Point.ElementType, 0, 0)
@@ -6829,7 +6829,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Connection>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Connection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Connection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.Connection.ElementType, 0, 0)
@@ -6901,14 +6901,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -6994,9 +6994,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Outline.ElementType, 0, 1),
@@ -7082,7 +7082,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.DataModelExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.DataModelExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.DataModelExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.DataModelExtension.ElementType, 0, 0)
@@ -7428,8 +7428,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.Style>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.PresentationLayoutVariables>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.Style.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.Style());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.PresentationLayoutVariables.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.PresentationLayoutVariables());
             builder.AddElement<PropertySet>()
                 .AddAttribute("presAssocID", a => a.PresentationElementId, aBuilder =>
                 {
@@ -7581,21 +7581,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -7712,9 +7712,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, 1, 1),
@@ -7807,7 +7807,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PtExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PtExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PtExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.PtExtension.ElementType, 0, 0)
@@ -7883,8 +7883,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.TextListStyleType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfoList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.TextListStyleType.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.TextListStyleType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfoList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfoList());
             builder.AddElement<DiagramDefinitionExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -8158,7 +8158,7 @@ public BooleanValue? UseDefault
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.DataModel>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.DataModel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.DataModel());
             builder.AddElement<SampleDataType>()
                 .AddAttribute("useDef", a => a.UseDefault);
         }
@@ -8231,7 +8231,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.DiagramDefinitionExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.DiagramDefinitionExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.DiagramDefinitionExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagrams.DiagramDefinitionExtension.ElementType, 0, 0)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_lockedCanvas.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_lockedCanvas.g.cs
index ed9325150..563d4b86a 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_lockedCanvas.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_lockedCanvas.g.cs
@@ -81,16 +81,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.VisualGroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TextShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.VisualGroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.VisualGroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TextShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TextShape());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeProperties.ElementType, 1, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_main.g.cs
index 703ff7238..1c2d45a59 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_main.g.cs
@@ -90,9 +90,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.StartTime>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EndTime>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.StartTime.ElementType, static () => new DocumentFormat.OpenXml.Drawing.StartTime());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EndTime.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EndTime());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.StartTime.ElementType, 1, 1),
@@ -337,7 +337,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<AudioFromFile>()
                 .AddAttribute("r:link", a => a.Link, aBuilder =>
                 {
@@ -433,7 +433,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<VideoFromFile>()
                 .AddAttribute("r:link", a => a.Link, aBuilder =>
                 {
@@ -529,7 +529,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<QuickTimeFromFile>()
                 .AddAttribute("r:link", a => a.Link, aBuilder =>
                 {
@@ -1755,34 +1755,34 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Complement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gray>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InverseGamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Inverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Red>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Green>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Complement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Complement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gray.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gray());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InverseGamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InverseGamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Inverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Inverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Red.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Red());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Green.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Green());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shade.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueModulation());
             builder.AddElement<RgbColorModelPercentage>()
                 .AddAttribute("r", a => a.RedPortion, aBuilder =>
                 {
@@ -1943,34 +1943,34 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Complement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gray>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InverseGamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Inverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Red>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Green>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Complement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Complement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gray.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gray());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InverseGamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InverseGamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Inverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Inverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Red.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Red());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Green.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Green());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shade.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueModulation());
             builder.AddElement<RgbColorModelHex>()
                 .AddAttribute("val", a => a.Val, aBuilder =>
                 {
@@ -2136,34 +2136,34 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Complement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gray>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InverseGamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Inverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Red>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Green>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Complement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Complement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gray.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gray());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InverseGamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InverseGamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Inverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Inverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Red.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Red());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Green.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Green());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shade.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueModulation());
             builder.AddElement<HslColor>()
                 .AddAttribute("hue", a => a.HueValue, aBuilder =>
                 {
@@ -2322,34 +2322,34 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Complement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gray>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InverseGamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Inverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Red>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Green>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Complement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Complement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gray.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gray());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InverseGamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InverseGamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Inverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Inverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Red.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Red());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Green.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Green());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shade.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueModulation());
             builder.AddElement<SystemColor>()
                 .AddAttribute("val", a => a.Val, aBuilder =>
                 {
@@ -2494,34 +2494,34 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Complement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gray>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InverseGamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Inverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Red>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Green>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Complement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Complement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gray.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gray());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InverseGamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InverseGamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Inverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Inverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Red.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Red());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Green.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Green());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shade.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueModulation());
             builder.AddElement<SchemeColor>()
                 .AddAttribute("val", a => a.Val, aBuilder =>
                 {
@@ -2662,34 +2662,34 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Complement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Gray>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InverseGamma>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Inverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Saturation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SaturationModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Luminance>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Red>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RedModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Green>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GreenModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlueModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hue>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shade>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Alpha>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulation>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HueModulation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Complement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Complement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Gray.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Gray());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InverseGamma.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InverseGamma());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Inverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Inverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Saturation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Saturation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SaturationModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SaturationModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Luminance.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Luminance());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Red.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Red());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RedModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RedModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Green.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Green());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GreenModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GreenModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlueModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hue.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hue());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shade.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shade());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Alpha.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Alpha());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulation());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HueModulation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HueModulation());
             builder.AddElement<PresetColor>()
                 .AddAttribute("val", a => a.Val, aBuilder =>
                 {
@@ -2837,11 +2837,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BevelTop>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BevelBottom>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtrusionColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ContourColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BevelTop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BevelTop());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BevelBottom.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BevelBottom());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtrusionColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtrusionColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ContourColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ContourColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<Shape3DType>()
                 .AddAttribute("z", a => a.Z, aBuilder =>
                 {
@@ -3103,7 +3103,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillToRectangle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillToRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillToRectangle());
             builder.AddElement<PathGradientFill>()
                 .AddAttribute("path", a => a.Path, aBuilder =>
                 {
@@ -3295,7 +3295,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillRectangle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillRectangle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.FillRectangle.ElementType, 0, 1)
@@ -3408,12 +3408,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -3590,10 +3590,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientStopList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LinearGradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PathGradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TileRectangle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientStopList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientStopList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LinearGradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LinearGradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PathGradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PathGradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TileRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TileRectangle());
             builder.AddElement<GradientFill>()
                 .AddAttribute("flip", a => a.Flip, aBuilder =>
                 {
@@ -3709,10 +3709,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SourceRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Stretch>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tile>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SourceRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SourceRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Stretch.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Stretch());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tile());
             builder.AddElement<BlipFill>()
                 .AddAttribute("dpi", a => a.Dpi)
                 .AddAttribute("rotWithShape", a => a.RotateWithShape);
@@ -3826,8 +3826,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ForegroundColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BackgroundColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ForegroundColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ForegroundColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BackgroundColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BackgroundColor());
             builder.AddElement<PatternFill>()
                 .AddAttribute("prst", a => a.Preset, aBuilder =>
                 {
@@ -4252,36 +4252,36 @@ public StringValue? Name
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaBiLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaCeiling>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaFloor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaInverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulationEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulationFixed>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaOutset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaReplace>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BiLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blend>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blur>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorReplacement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Duotone>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectContainer>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Effect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillOverlay>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Glow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Grayscale>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hsl>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InnerShadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.OuterShadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetShadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Reflection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RelativeOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SoftEdge>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TintEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TransformEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaBiLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaBiLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaCeiling.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaCeiling());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaFloor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaFloor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaInverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaInverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulationEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulationEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulationFixed.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulationFixed());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaOutset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaOutset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaReplace.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaReplace());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BiLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BiLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blend.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blend());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blur.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blur());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorChange.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorChange());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorReplacement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorReplacement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Duotone.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Duotone());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectContainer.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectContainer());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Effect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Effect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Fill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillOverlay.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillOverlay());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Glow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Glow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Grayscale.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Grayscale());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hsl.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hsl());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InnerShadow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InnerShadow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.OuterShadow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.OuterShadow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetShadow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetShadow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Reflection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Reflection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RelativeOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RelativeOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SoftEdge.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SoftEdge());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TintEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TintEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TransformEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TransformEffect());
             builder.AddElement<EffectContainerType>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -4504,12 +4504,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -4663,7 +4663,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectContainer>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectContainer.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectContainer());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.EffectContainer.ElementType, 1, 1)
@@ -4933,7 +4933,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectContainer>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectContainer.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectContainer());
             builder.AddElement<Blend>()
                 .AddAttribute("blend", a => a.BlendMode, aBuilder =>
                 {
@@ -5084,8 +5084,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorFrom>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorTo>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorFrom.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorFrom());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorTo.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorTo());
             builder.AddElement<ColorChange>()
                 .AddAttribute("useA", a => a.UseAlpha);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -5184,12 +5184,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -5348,12 +5348,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 2, 2)
@@ -5434,12 +5434,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -5608,12 +5608,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<FillOverlay>()
                 .AddAttribute("blend", a => a.Blend, aBuilder =>
                 {
@@ -5788,12 +5788,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<Glow>()
                 .AddAttribute("rad", a => a.Radius, aBuilder =>
                 {
@@ -6090,12 +6090,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<InnerShadow>()
                 .AddAttribute("blurRad", a => a.BlurRadius, aBuilder =>
                 {
@@ -6417,12 +6417,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<OuterShadow>()
                 .AddAttribute("blurRad", a => a.BlurRadius, aBuilder =>
                 {
@@ -6639,12 +6639,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<PresetShadow>()
                 .AddAttribute("prst", a => a.Preset, aBuilder =>
                 {
@@ -7304,14 +7304,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blur>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillOverlay>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Glow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InnerShadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.OuterShadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetShadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Reflection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SoftEdge>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blur.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blur());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillOverlay.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillOverlay());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Glow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Glow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InnerShadow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InnerShadow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.OuterShadow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.OuterShadow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetShadow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetShadow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Reflection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Reflection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SoftEdge.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SoftEdge());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Blur.ElementType, 0, 1),
@@ -7492,12 +7492,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AdjustHandleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionSiteList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AdjustValueList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeGuideList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Rectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PathList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AdjustHandleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AdjustHandleList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionSiteList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionSiteList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AdjustValueList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AdjustValueList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeGuideList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeGuideList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Rectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Rectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PathList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PathList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.AdjustValueList.ElementType, 0, 1),
@@ -7655,7 +7655,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AdjustValueList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AdjustValueList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AdjustValueList());
             builder.AddElement<PresetGeometry>()
                 .AddAttribute("prst", a => a.Preset, aBuilder =>
                 {
@@ -7749,7 +7749,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AdjustValueList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AdjustValueList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AdjustValueList());
             builder.AddElement<PresetTextWarp>()
                 .AddAttribute("prst", a => a.Preset, aBuilder =>
                 {
@@ -7983,7 +7983,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.DashStop>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.DashStop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.DashStop());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.DashStop.ElementType, 0, 0)
@@ -8053,12 +8053,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -8466,12 +8466,12 @@ public UInt32Value? Index
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<StyleMatrixReferenceType>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -8613,8 +8613,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -8931,11 +8931,11 @@ protected FontCollectionType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SupplementalFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LatinFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EastAsianFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ComplexScriptFont>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SupplementalFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SupplementalFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LatinFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LatinFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EastAsianFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EastAsianFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ComplexScriptFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ComplexScriptFont());
         }
 
         /// <summary>
@@ -9047,12 +9047,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<FontReference>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -10005,12 +10005,12 @@ protected ColorType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
         }
 
         /// <summary>
@@ -10657,7 +10657,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blip>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blip());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Blip.ElementType, 1, 1)
@@ -11647,18 +11647,18 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.PenAlignmentValues>? Alignment
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomDash>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HeadEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TailEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineJoinBevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Miter>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Round>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetDash>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomDash.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomDash());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HeadEnd.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HeadEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TailEnd.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TailEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineJoinBevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineJoinBevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Miter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Miter());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Round.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Round());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LinePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetDash.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetDash());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<LinePropertiesType>()
                 .AddAttribute("w", a => a.Width, aBuilder =>
                 {
@@ -11768,12 +11768,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -11925,8 +11925,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Text.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Text());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.RunProperties.ElementType, 0, 1),
@@ -12018,7 +12018,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RunProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RunProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.RunProperties.ElementType, 0, 1)
@@ -12118,9 +12118,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Text.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Text());
             builder.AddElement<Field>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -12233,7 +12233,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicData>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GraphicData.ElementType, 1, 1)
@@ -12364,24 +12364,24 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaBiLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaCeiling>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaFloor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaInverse>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulationEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaModulationFixed>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AlphaReplace>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BiLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blur>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorReplacement>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Duotone>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillOverlay>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Grayscale>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hsl>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LuminanceEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TintEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaBiLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaBiLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaCeiling.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaCeiling());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaFloor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaFloor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaInverse.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaInverse());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulationEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulationEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaModulationFixed.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaModulationFixed());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AlphaReplace.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AlphaReplace());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BiLevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BiLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blur.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blur());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorChange.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorChange());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorReplacement.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorReplacement());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Duotone.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Duotone());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillOverlay.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillOverlay());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Grayscale.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Grayscale());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hsl.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hsl());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LuminanceEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LuminanceEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TintEffect.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TintEffect());
             builder.AddElement<Blip>()
                 .AddAttribute("r:embed", a => a.Embed)
                 .AddAttribute("r:link", a => a.Link)
@@ -12502,11 +12502,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ThemeElements>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtraColorSchemeList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomColorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ObjectDefaults>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.OfficeStyleSheetExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ThemeElements.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ThemeElements());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtraColorSchemeList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtraColorSchemeList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomColorList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomColorList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ObjectDefaults.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ObjectDefaults());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.OfficeStyleSheetExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.OfficeStyleSheetExtensionList());
             builder.AddElement<Theme>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("thm15:id", a => a.ThemeId, aBuilder =>
@@ -12680,9 +12680,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorScheme>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontScheme>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FormatScheme>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorScheme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorScheme());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontScheme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontScheme());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FormatScheme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FormatScheme());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ColorScheme.ElementType, 0, 1),
@@ -12907,9 +12907,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableRow>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableGrid.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableRow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableRow());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.TableProperties.ElementType, 0, 1),
@@ -13012,7 +13012,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableStyleEntry>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableStyleEntry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableStyleEntry());
             builder.AddElement<TableStyleList>()
                 .AddAttribute("def", a => a.Default, aBuilder =>
                 {
@@ -13114,7 +13114,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -13312,12 +13312,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<CustomColor>()
                 .AddAttribute("name", a => a.Name);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -13535,10 +13535,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Backdrop>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Camera>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LightRig>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Backdrop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Backdrop());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Camera.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Camera());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LightRig.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LightRig());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Camera.ElementType, 1, 1),
@@ -13661,10 +13661,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -13743,12 +13743,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 3, 0)
@@ -13824,7 +13824,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Outline.ElementType, 3, 0)
@@ -13889,7 +13889,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectStyle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.EffectStyle.ElementType, 3, 0)
@@ -13959,12 +13959,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 3, 0)
@@ -14062,19 +14062,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Dark1Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Light1Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Dark2Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Light2Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Accent1Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Accent2Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Accent3Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Accent4Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Accent5Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Accent6Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FollowedHyperlinkColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Dark1Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Dark1Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Light1Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Light1Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Dark2Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Dark2Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Light2Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Light2Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Accent1Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Accent1Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Accent2Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Accent2Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Accent3Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Accent3Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Accent4Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Accent4Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Accent5Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Accent5Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Accent6Color.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Accent6Color());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FollowedHyperlinkColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FollowedHyperlinkColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<ColorScheme>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -14337,9 +14337,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.MajorFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.MinorFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.MajorFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.MajorFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.MinorFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.MinorFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<FontScheme>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -14463,10 +14463,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BackgroundFillStyleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectStyleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillStyleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineStyleList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BackgroundFillStyleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BackgroundFillStyleList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectStyleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectStyleList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillStyleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillStyleList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineStyleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineStyleList());
             builder.AddElement<FormatScheme>()
                 .AddAttribute("name", a => a.Name);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -15455,11 +15455,11 @@ protected Color2Type(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
         }
 
         /// <summary>
@@ -16041,7 +16041,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<ShapeLocks>()
                 .AddAttribute("noGrp", a => a.NoGrouping)
                 .AddAttribute("noSelect", a => a.NoSelection)
@@ -16231,7 +16231,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectorLockingExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectorLockingExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectorLockingExtensionList());
             builder.AddElement<ConnectionShapeLocks>()
                 .AddAttribute("noGrp", a => a.NoGrouping)
                 .AddAttribute("noSelect", a => a.NoSelection)
@@ -16495,7 +16495,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<GraphicFrameLocks>()
                 .AddAttribute("noGrp", a => a.NoGrouping)
                 .AddAttribute("noDrilldown", a => a.NoDrilldown)
@@ -16938,355 +16938,355 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ThemeOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blip>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.LaserColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenEffectsProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ThemeManager>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenFillProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LockedCanvas.LockedCanvas>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenLineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Diagram.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Pictures.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Theme>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenScene3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenShape3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Pictures.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableStyleList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.TextListStyleType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.Transform2D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionHeightOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionVerticalOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.CameraTool>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.CompatExtension>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.IsCanvas>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ImageProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ShadowObscured>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.TextMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.UseLocalDpi>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.BackgroundProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.NonVisualGroupProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ObjectProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ConnectableReferences>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.CreationId>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.RowIdIdentifier>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ColIdIdentifier>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.PredecessorDrawingElementReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.PictureAttributionSourceURL>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.DocumentClassification.ClassificationOutcome>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Decorative>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.HyperLinkColor.HyperlinkColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Y2022.ImageFormula.ImageFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OEmbedShared>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchStyleProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.ScriptLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.SVG.SVGBlip>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.InvertIfNegativeBoolean>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.Bubble3DBoolean>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ExceptionForSave>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowLeaderLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.AutoGeneneratedCategories>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.LeaderLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartSpace>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.DLbl>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.Marker>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.PivotSource>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.ChartReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UnsignedIntegerType>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.PivotOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.SketchOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Charts.Style>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBubbleSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredRadarSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredScatterSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Charts.PivotOptions16>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Chart.DataDisplayOptions16>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Charts.UserShapes>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LegacyCompatibility.LegacyDrawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ChartStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ColorStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeaderList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.DataModelRoot>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeaderList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.RelationshipIds>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeaderList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Diagram.RecolorImages>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfoList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.DataModelExtensionBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Arc>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Derivation>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.DerivedFrom>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Emma>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.EndPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.EndPointInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Grammar>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.GroupInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Info>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Interpretation>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Lattice>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Literal>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Model>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Node>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.OneOf>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Sequence>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Ink>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Ink.ContextNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ClipPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Complex>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Diagram>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.FillExtendedProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Ink>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.OleObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ShapeDefaults>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ShapeLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.LeftStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.TopStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.RightStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.BottomStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ColumnStroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ConnectorMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.DocumentContextMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMkLstDrawingElementMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMasterMkLstDrawingElementMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingSelectionStgList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.EditorSelectionStgList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicFrameMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicParentMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupCommand>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.HyperlinkMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ImgDataImgData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.OrigImgDataImgData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ImgLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.InkMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.Model3DMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.PictureMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ShapeMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TableCellMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TableColumnMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TableMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TableRowMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyPackage>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.TextCharRangeMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.Command.ViewSelectionStgList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentAuthorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.HoneycombTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.FlashTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionListModify>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HandoutMaster>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.WarpTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesMaster>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesSlide>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.OleObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.DoorsTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.WindowTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Presentation>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PresentationProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.VortexTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.PanTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Slide>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideMaster>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideSyncProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TagList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.WheelReverseTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.BrowseMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualContentPartProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.DefaultImageDpi>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.DiscardImageEditData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.FlythroughTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.GlitterTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.LaserTraceList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SwitchTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.FlipTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.FerrisTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.GalleryTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ConveyorTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.Media>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.BookmarkTarget>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.PrismTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.CreationId>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ModificationId>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.RevealTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.RippleTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SectionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SectionProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ShowEventRecordList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ShowMediaControls>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ShredTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ChartTrackingReferenceBased>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ThreadingInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.NotesGuideList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.PresenceInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.PresetTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.AuthorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentRelationship>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistoryDetails>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeExtension>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.AnimEffectMkLstAnimationEffectMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.AnimEffectParentMkLstAnimationEffectMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.CommentAuthorMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.CommentMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.CustomShowMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.CustomXmlPartMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.DesignerTagMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.DocumentMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.HandoutMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.MainMasterMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesMasterMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesTextMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.OsfTaskPaneAppMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SectionLinkObjMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SectionMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideBaseMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideLayoutMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SlidePosMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.StringTagMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Presentation.Command.SummaryZoomMonikerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Pictures.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.InkAnnotationFlag>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Presentation.TextData>();
-            builder.AddChild<DocumentFormat.OpenXml.CustomXmlSchemaReferences.SchemaLibrary>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Slicer.Slicer>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Theme.ThemeFamily>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.TimeSlicer.TimeSlicer>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Arc>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Background>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Curve>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Formulas>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ShapeHandles>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Line>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Oval>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Path>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.PolyLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Rectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.RoundRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shapetype>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.TextPath>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Comments>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.DataBinding>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Document>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSectionItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.EntityPickerEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Endnotes>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Fonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Footnotes>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GlossaryDocument>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Header>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Footer>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Numbering>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.ChartTrackingRefBased>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.DefaultCollapsed>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.WebExtensionLinked>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.WebExtensionCreated>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Recipients>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Settings>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Styles>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxContent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebSettings>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DefaultImageDpi>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DocumentId>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ConflictMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DiscardImageEditingData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SdtContentCheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.CommentsEx>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.PersistentDocumentId>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.People>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.Appearance>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtension>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.Y2020.OEmbed.OEmbed>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.Anchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.Inline>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeHeight>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.Drawing.WebVideoProperty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.WordprocessingCanvas>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.WordprocessingGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.WorksheetDrawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ThemeOverride.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ThemeOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blip());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.LaserColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.LaserColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenEffectsProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenEffectsProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ThemeManager.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ThemeManager());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenFillProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LockedCanvas.LockedCanvas.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LockedCanvas.LockedCanvas());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenLineProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenLineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Diagram.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Diagram.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Pictures.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Pictures.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Theme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Theme());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenScene3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenScene3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenShape3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenShape3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Pictures.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Pictures.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Table.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableStyleList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableStyleList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.TextListStyleType.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Diagram12.TextListStyleType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.Transform2D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionHeightOffset.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionHeightOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionVerticalOffset.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionVerticalOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.CameraTool.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.CameraTool());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.CompatExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.CompatExtension());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.IsCanvas.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.IsCanvas());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ImageProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ImageProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ShadowObscured.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ShadowObscured());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.TextMath.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.TextMath());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.UseLocalDpi.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.UseLocalDpi());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.BackgroundProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.BackgroundProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.NonVisualGroupProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.NonVisualGroupProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ObjectProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ObjectProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ConnectableReferences.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ConnectableReferences());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.CreationId.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.CreationId());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.RowIdIdentifier.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.RowIdIdentifier());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.ColIdIdentifier.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.ColIdIdentifier());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.PredecessorDrawingElementReference.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.PredecessorDrawingElementReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.PictureAttributionSourceURL.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.PictureAttributionSourceURL());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.DocumentClassification.ClassificationOutcome.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.DocumentClassification.ClassificationOutcome());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Decorative.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Decorative());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.HyperLinkColor.HyperlinkColor.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.HyperLinkColor.HyperlinkColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Y2022.ImageFormula.ImageFormula.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Y2022.ImageFormula.ImageFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OEmbedShared.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OEmbedShared());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchStyleProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchStyleProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.ScriptLink.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.ScriptLink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.SVG.SVGBlip.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.SVG.SVGBlip());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.InvertIfNegativeBoolean.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.InvertIfNegativeBoolean());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.Bubble3DBoolean.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.Bubble3DBoolean());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ExceptionForSave.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ExceptionForSave());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowDataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowLeaderLines.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ShowLeaderLines());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.AutoGeneneratedCategories.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.AutoGeneneratedCategories());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.LeaderLines.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.LeaderLines());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartSpace.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartSpace());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.DLbl.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.DLbl());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.Layout());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.Marker.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.Marker());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.PivotSource.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.PivotSource());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.ChartReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.ChartReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.ChartText());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UnsignedIntegerType.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UnsignedIntegerType());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.InvertSolidFillFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.PivotOptions.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.PivotOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.SketchOptions.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.SketchOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Charts.Style.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Charts.Style());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelFieldTable());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredAreaSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBarSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBubbleSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredBubbleSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredCategoryTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredLineSeriesExtension());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredPieSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredRadarSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredRadarSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredScatterSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredScatterSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSeriesTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FilteredSurfaceSeries());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FormulaReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.FullReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.LevelReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.Chart.DataLabelsRange());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.CategoryFilterExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.ChartDataPointUniqueIDMap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.UniqueIdChartUniqueID());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Charts.PivotOptions16.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Charts.PivotOptions16());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Chart.DataDisplayOptions16.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Chart.DataDisplayOptions16());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Charts.UserShapes.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Charts.UserShapes());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ChartDrawing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LegacyCompatibility.LegacyDrawing.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LegacyCompatibility.LegacyDrawing());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ChartStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ChartStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ColorStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ChartStyle.ColorStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeaderList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.ColorsDefinitionHeaderList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.DataModelRoot.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.DataModelRoot());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeaderList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.LayoutDefinitionHeaderList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.RelationshipIds.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.RelationshipIds());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeader.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeaderList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagrams.StyleDefinitionHeaderList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Diagram.RecolorImages.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Diagram.RecolorImages());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfoList.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Diagram11.NumberDiagramInfoList());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.DataModelExtensionBlock.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.DataModelExtensionBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Arc.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Arc());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Derivation.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Derivation());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.DerivedFrom.ElementType, static () => new DocumentFormat.OpenXml.EMMA.DerivedFrom());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Emma.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Emma());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.EndPoint.ElementType, static () => new DocumentFormat.OpenXml.EMMA.EndPoint());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.EndPointInfo.ElementType, static () => new DocumentFormat.OpenXml.EMMA.EndPointInfo());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Grammar.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Grammar());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Group.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Group());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.GroupInfo.ElementType, static () => new DocumentFormat.OpenXml.EMMA.GroupInfo());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Info.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Info());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Interpretation.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Interpretation());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Lattice.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Lattice());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Literal.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Literal());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Model.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Model());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Node.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Node());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.OneOf.ElementType, static () => new DocumentFormat.OpenXml.EMMA.OneOf());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Sequence.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Sequence());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Ink.ElementType, static () => new DocumentFormat.OpenXml.InkML.Ink());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.MathProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Ink.ContextNode.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Ink.ContextNode());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ClipPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ClipPath());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Complex.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Complex());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Diagram.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Diagram());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.FillExtendedProperties.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.FillExtendedProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Ink.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Ink());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.OleObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.OleObject());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ShapeDefaults.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ShapeDefaults());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ShapeLayout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ShapeLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.LeftStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.LeftStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.TopStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.TopStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.RightStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.RightStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.BottomStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.BottomStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ColumnStroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ColumnStroke());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ConnectorMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ConnectorMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.DocumentContextMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.DocumentContextMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMkLstDrawingElementMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMkLstDrawingElementMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMasterMkLstDrawingElementMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.DeMasterMkLstDrawingElementMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingSelectionStgList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.DrawingSelectionStgList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.EditorSelectionStgList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.EditorSelectionStgList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicFrameMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicFrameMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicParentMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.GraphicParentMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupCommand.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupCommand());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.GroupShapeMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.HyperlinkMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.HyperlinkMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ImgDataImgData.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ImgDataImgData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.OrigImgDataImgData.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.OrigImgDataImgData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ImgLink.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ImgLink());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.InkMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.InkMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.Model3DMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.Model3DMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.PictureMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.PictureMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ShapeMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ShapeMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TableCellMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TableCellMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TableColumnMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TableColumnMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TableMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TableMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TableRowMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TableRowMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyPackage.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TextBodyPackage());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.TextCharRangeMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.TextCharRangeMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.Command.ViewSelectionStgList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.Command.ViewSelectionStgList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommentAuthorList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommentAuthorList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommentList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommentList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.HoneycombTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.HoneycombTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.FlashTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.FlashTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionListModify.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionListModify());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HandoutMaster.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HandoutMaster());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.WarpTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.WarpTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesMaster.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesMaster());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesSlide.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesSlide());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.OleObject.ElementType, static () => new DocumentFormat.OpenXml.Presentation.OleObject());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.DoorsTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.DoorsTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.WindowTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.WindowTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Presentation.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Presentation());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PresentationProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PresentationProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.VortexTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.VortexTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.PanTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.PanTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Slide.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Slide());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideLayout.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideMaster.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideMaster());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideSyncProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideSyncProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TagList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TagList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.WheelReverseTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.WheelReverseTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.BrowseMode.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.BrowseMode());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualContentPartProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.DefaultImageDpi.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.DefaultImageDpi());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.DiscardImageEditData.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.DiscardImageEditData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.FlythroughTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.FlythroughTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.GlitterTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.GlitterTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.LaserTraceList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.LaserTraceList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SwitchTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SwitchTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.FlipTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.FlipTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.FerrisTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.FerrisTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.GalleryTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.GalleryTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ConveyorTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ConveyorTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.Media.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.Media());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.BookmarkTarget.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.BookmarkTarget());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.PrismTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.PrismTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.CreationId.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.CreationId());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ModificationId.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ModificationId());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.RevealTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.RevealTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.RippleTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.RippleTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SectionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SectionProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ShowEventRecordList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ShowEventRecordList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ShowMediaControls.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ShowMediaControls());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ShredTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ShredTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ChartTrackingReferenceBased.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ChartTrackingReferenceBased());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ThreadingInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ThreadingInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.NotesGuideList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.NotesGuideList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.PresenceInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.PresenceInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.PresetTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.PresetTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.AuthorList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.AuthorList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentList.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentRelationship.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentRelationship());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistoryDetails.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Tasks.TaskHistoryDetails());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeExtension.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeExtension());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.AnimEffectMkLstAnimationEffectMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.AnimEffectMkLstAnimationEffectMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.AnimEffectParentMkLstAnimationEffectMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.AnimEffectParentMkLstAnimationEffectMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.CommentAuthorMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.CommentAuthorMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.CommentMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.CommentMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.CustomShowMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.CustomShowMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.CustomXmlPartMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.CustomXmlPartMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.DesignerTagMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.DesignerTagMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.DocumentMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.DocumentMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.HandoutMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.HandoutMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.MainMasterMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.MainMasterMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesMasterMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesMasterMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesTextMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.NotesTextMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.OsfTaskPaneAppMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.OsfTaskPaneAppMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SectionLinkObjMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SectionLinkObjMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SectionMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SectionMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideBaseMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideBaseMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideLayoutMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideLayoutMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SlideMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SlidePosMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SlidePosMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.StringTagMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.StringTagMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Presentation.Command.SummaryZoomMonikerList.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Presentation.Command.SummaryZoomMonikerList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Pictures.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Pictures.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.InkAnnotationFlag.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.InkAnnotationFlag());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Presentation.TextData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Presentation.TextData());
+            builder.AddChild(DocumentFormat.OpenXml.CustomXmlSchemaReferences.SchemaLibrary.ElementType, static () => new DocumentFormat.OpenXml.CustomXmlSchemaReferences.SchemaLibrary());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Slicer.Slicer.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Slicer.Slicer());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Theme.ThemeFamily.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Theme.ThemeFamily());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.TimeSlicer.TimeSlicer.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.TimeSlicer.TimeSlicer());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Arc.ElementType, static () => new DocumentFormat.OpenXml.Vml.Arc());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Background.ElementType, static () => new DocumentFormat.OpenXml.Vml.Background());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Curve.ElementType, static () => new DocumentFormat.OpenXml.Vml.Curve());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Formulas.ElementType, static () => new DocumentFormat.OpenXml.Vml.Formulas());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Group.ElementType, static () => new DocumentFormat.OpenXml.Vml.Group());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ShapeHandles.ElementType, static () => new DocumentFormat.OpenXml.Vml.ShapeHandles());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageFile.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageFile());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Line.ElementType, static () => new DocumentFormat.OpenXml.Vml.Line());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Oval.ElementType, static () => new DocumentFormat.OpenXml.Vml.Oval());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Path.ElementType, static () => new DocumentFormat.OpenXml.Vml.Path());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.PolyLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.PolyLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Rectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.Rectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.RoundRectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.RoundRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shape.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shapetype.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shapetype());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.TextPath.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextPath());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.Color.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Comments.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Comments());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.DataBinding.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.DataBinding());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Document.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Document());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSectionItem.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSectionItem());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.EntityPickerEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.EntityPickerEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Endnotes.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Endnotes());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Fonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Fonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Footnotes.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Footnotes());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GlossaryDocument.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GlossaryDocument());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Header.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Header());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Footer.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Footer());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Numbering.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Numbering());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.ChartTrackingRefBased.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.ChartTrackingRefBased());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.DefaultCollapsed.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.DefaultCollapsed());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.WebExtensionLinked.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.WebExtensionLinked());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.WebExtensionCreated.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.WebExtensionCreated());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Recipients.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Recipients());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Settings.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Settings());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Styles.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Styles());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxContent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxContent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebSettings.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebSettings());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.AnchorLock());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Wordprocessing.TextWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DefaultImageDpi.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DefaultImageDpi());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DocumentId.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DocumentId());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ConflictMode.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ConflictMode());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DiscardImageEditingData.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DiscardImageEditingData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SdtContentCheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SdtContentCheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.CommentsEx.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.CommentsEx());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.PersistentDocumentId.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.PersistentDocumentId());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.People.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.People());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.Appearance.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.Appearance());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSection.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtension());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionReference.ElementType, static () => new DocumentFormat.OpenXml.Office2013.WebExtension.WebExtensionReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.Y2020.OEmbed.OEmbed.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.Y2020.OEmbed.OEmbed());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.Anchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.Anchor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.Inline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.Inline());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeWidth.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeHeight.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeHeight());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.Drawing.WebVideoProperty.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.Drawing.WebVideoProperty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.WordprocessingCanvas.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingCanvas.WordprocessingCanvas());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.WordprocessingGroup.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingGroup.WordprocessingGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DrawingShape.WordprocessingShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.WorksheetDrawing.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.WorksheetDrawing());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Vml.Spreadsheet.ClientData());
             builder.AddElement<GraphicData>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -17606,9 +17606,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, 1, 1),
@@ -17762,8 +17762,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform2D>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -17911,9 +17911,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -18042,8 +18042,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeLocks());
             builder.AddElement<NonVisualShapeDrawingProperties>()
                 .AddAttribute("txBox", a => a.TextBox);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -18138,8 +18138,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualShapeDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualShapeDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -18255,21 +18255,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -18387,10 +18387,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.UseShapeRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.UseShapeRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.UseShapeRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TextBody.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.TextBody.ElementType, 1, 1),
@@ -18477,10 +18477,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, 1, 1),
@@ -18603,10 +18603,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.StartConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EndConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.StartConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.StartConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EndConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EndConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, 0, 1),
@@ -18727,8 +18727,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualConnectorShapeDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualConnectorShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualConnectorShapeDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -18831,8 +18831,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PictureLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PictureLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PictureLocks());
             builder.AddElement<NonVisualPictureDrawingProperties>()
                 .AddAttribute("preferRelativeResize", a => a.PreferRelativeResize);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -18927,8 +18927,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualPictureDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualPictureDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualPictureDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -19021,8 +19021,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicFrameLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicFrameLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, 0, 1),
@@ -19115,8 +19115,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGraphicFrameDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGraphicFrameDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGraphicFrameDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -19209,8 +19209,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, 0, 1),
@@ -19408,7 +19408,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Rotation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Rotation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Rotation());
             builder.AddElement<Camera>()
                 .AddAttribute("prst", a => a.Preset, aBuilder =>
                 {
@@ -19520,7 +19520,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Rotation>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Rotation.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Rotation());
             builder.AddElement<LightRig>()
                 .AddAttribute("rig", a => a.Rig, aBuilder =>
                 {
@@ -19612,10 +19612,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Anchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Normal>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.UpVector>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Anchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Anchor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Normal.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Normal());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.UpVector.ElementType, static () => new DocumentFormat.OpenXml.Drawing.UpVector());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Anchor.ElementType, 1, 1),
@@ -20308,12 +20308,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<GradientStop>()
                 .AddAttribute("pos", a => a.Position, aBuilder =>
                 {
@@ -20473,7 +20473,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientStop>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientStop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientStop());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GradientStop.ElementType, 2, 0)
@@ -20783,7 +20783,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Position>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Position.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Position());
             builder.AddElement<AdjustHandleXY>()
                 .AddAttribute("gdRefX", a => a.XAdjustmentGuide, aBuilder =>
                 {
@@ -20962,7 +20962,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Position>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Position.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Position());
             builder.AddElement<AdjustHandlePolar>()
                 .AddAttribute("gdRefR", a => a.RadialAdjustmentGuide, aBuilder =>
                 {
@@ -21091,7 +21091,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Position>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Position.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Position());
             builder.AddElement<ConnectionSite>()
                 .AddAttribute("ang", a => a.Angle, aBuilder =>
                 {
@@ -21209,7 +21209,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Point>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Point.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Point());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Point.ElementType, 1, 1)
@@ -21287,7 +21287,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Point>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Point.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Point());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Point.ElementType, 1, 1)
@@ -21472,7 +21472,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Point>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Point.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Point());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Point.ElementType, 2, 2)
@@ -21537,7 +21537,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Point>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Point.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Point());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Point.ElementType, 3, 3)
@@ -21657,12 +21657,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ArcTo>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CloseShapePath>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CubicBezierCurveTo>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineTo>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.MoveTo>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.QuadraticBezierCurveTo>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ArcTo.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ArcTo());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CloseShapePath.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CloseShapePath());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CubicBezierCurveTo.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CubicBezierCurveTo());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineTo.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineTo());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.MoveTo.ElementType, static () => new DocumentFormat.OpenXml.Drawing.MoveTo());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.QuadraticBezierCurveTo.ElementType, static () => new DocumentFormat.OpenXml.Drawing.QuadraticBezierCurveTo());
             builder.AddElement<Path>()
                 .AddAttribute("w", a => a.Width, aBuilder =>
                 {
@@ -21874,7 +21874,7 @@ protected GeometryGuideListType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeGuide>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeGuide.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeGuide());
         }
     }
 
@@ -21933,8 +21933,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AdjustHandlePolar>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AdjustHandleXY>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AdjustHandlePolar.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AdjustHandlePolar());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AdjustHandleXY.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AdjustHandleXY());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.AdjustHandleXY.ElementType, 1, 1),
@@ -22000,7 +22000,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionSite>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionSite.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionSite());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ConnectionSite.ElementType, 0, 0)
@@ -22172,7 +22172,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Path>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Path.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Path());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Path.ElementType, 0, 0)
@@ -22333,10 +22333,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChildOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ChildExtents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChildOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChildOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ChildExtents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ChildExtents());
             builder.AddElement<TransformGroup>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -22657,14 +22657,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FlatText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetTextWarp>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoAutoFit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NormalAutoFit>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeAutoFit>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FlatText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FlatText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetTextWarp.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetTextWarp());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoAutoFit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NormalAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NormalAutoFit());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeAutoFit.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeAutoFit());
             builder.AddElement<BodyProperties>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("spcFirstLastPara", a => a.UseParagraphSpacing)
@@ -22812,17 +22812,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties.ElementType, 0, 1),
@@ -23259,11 +23259,11 @@ protected DefaultShapeDefinitionType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
         }
 
         /// <summary>
@@ -23633,7 +23633,7 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.ColorSchemeIndexValues>? Followe
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<ColorMappingType>()
                 .AddAttribute("bg1", a => a.Background1, aBuilder =>
                 {
@@ -23766,8 +23766,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorScheme>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorMap.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorMap());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorScheme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorScheme());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ColorScheme.ElementType, 1, 1),
@@ -23862,10 +23862,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ColorScheme>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontScheme>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FormatScheme>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ColorScheme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ColorScheme());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontScheme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontScheme());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FormatScheme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FormatScheme());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ColorScheme.ElementType, 1, 1),
@@ -23997,9 +23997,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Bevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LightRig>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Bevel.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Bevel());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LightRig.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LightRig());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<Cell3DProperties>()
                 .AddAttribute("prstMaterial", a => a.PresetMaterial, aBuilder =>
                 {
@@ -24203,20 +24203,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Cell3DProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LeftBorderLineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RightBorderLineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TopBorderLineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BottomBorderLineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TopLeftToBottomRightBorderLineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BottomLeftToTopRightBorderLineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Cell3DProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Cell3DProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LeftBorderLineProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LeftBorderLineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RightBorderLineProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RightBorderLineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TopBorderLineProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TopBorderLineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BottomBorderLineProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BottomBorderLineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TopLeftToBottomRightBorderLineProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TopLeftToBottomRightBorderLineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BottomLeftToTopRightBorderLineProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BottomLeftToTopRightBorderLineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<TableCellProperties>()
                 .AddAttribute("marL", a => a.LeftMargin)
                 .AddAttribute("marR", a => a.RightMargin)
@@ -24451,9 +24451,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableCellProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TextBody>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableCellProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableCellProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TextBody.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TextBody());
             builder.AddElement<TableCell>()
                 .AddAttribute("rowSpan", a => a.RowSpan)
                 .AddAttribute("gridSpan", a => a.GridSpan)
@@ -24785,21 +24785,21 @@ public StringValue? StyleName
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableBackground>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.WholeTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Band1Horizontal>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Band2Horizontal>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Band1Vertical>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Band2Vertical>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LastColumn>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FirstColumn>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LastRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SoutheastCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SouthwestCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FirstRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NortheastCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NorthwestCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableBackground.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableBackground());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.WholeTable.ElementType, static () => new DocumentFormat.OpenXml.Drawing.WholeTable());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Band1Horizontal.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Band1Horizontal());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Band2Horizontal.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Band2Horizontal());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Band1Vertical.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Band1Vertical());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Band2Vertical.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Band2Vertical());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LastColumn.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LastColumn());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FirstColumn.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FirstColumn());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LastRow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LastRow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SoutheastCell.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SoutheastCell());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SouthwestCell.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SouthwestCell());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FirstRow.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FirstRow());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NortheastCell.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NortheastCell());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NorthwestCell.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NorthwestCell());
             builder.AddElement<TableStyleType>()
                 .AddAttribute("styleId", a => a.StyleId, aBuilder =>
                 {
@@ -25116,7 +25116,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<GridColumn>()
                 .AddAttribute("w", a => a.Width, aBuilder =>
                 {
@@ -25280,17 +25280,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableStyleId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableStyleId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableStyleId());
             builder.AddElement<TableProperties>()
                 .AddAttribute("rtl", a => a.RightToLeft)
                 .AddAttribute("firstRow", a => a.FirstRow)
@@ -25388,7 +25388,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GridColumn>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GridColumn.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GridColumn());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GridColumn.ElementType, 1, 1000)
@@ -25464,8 +25464,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableCell.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableCell());
             builder.AddElement<TableRow>()
                 .AddAttribute("h", a => a.Height, aBuilder =>
                 {
@@ -26065,8 +26065,8 @@ protected ThemeableLineStyleType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
         }
 
         /// <summary>
@@ -26158,15 +26158,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InsideHorizontalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.InsideVerticalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TopLeftToBottomRightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TopRightToBottomLeftBorder>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InsideHorizontalBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InsideHorizontalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.InsideVerticalBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.InsideVerticalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TopLeftToBottomRightBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TopLeftToBottomRightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TopRightToBottomLeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TopRightToBottomLeftBorder());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LeftBorder.ElementType, 0, 1),
@@ -26384,15 +26384,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Fonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Fonts.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Fonts());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<TableCellTextStyle>()
                 .AddAttribute("b", a => a.Bold, aBuilder =>
                 {
@@ -26489,10 +26489,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Cell3DProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableCellBorders>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Cell3DProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Cell3DProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableCellBorders.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableCellBorders());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.TableCellBorders.ElementType, 0, 1),
@@ -26582,10 +26582,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectPropertiesType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectPropertiesType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectPropertiesType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -27523,8 +27523,8 @@ protected TablePartStyleType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableCellStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableCellTextStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableCellStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableCellStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TableCellTextStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TableCellTextStyle());
         }
 
         /// <summary>
@@ -29053,23 +29053,23 @@ public BooleanValue? Height
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AutoNumberedBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PictureBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletColorText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletSizeText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletSizePercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletSizePoints>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletFontText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.DefaultRunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CharacterBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BulletFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoBullet>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SpaceBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SpaceAfter>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TabStopList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AutoNumberedBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AutoNumberedBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PictureBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PictureBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletColorText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletColorText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletSizeText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletSizeText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletSizePercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletSizePercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletSizePoints.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletSizePoints());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletFontText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletFontText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.DefaultRunProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.DefaultRunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CharacterBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CharacterBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BulletFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BulletFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoBullet.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoBullet());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineSpacing.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SpaceBefore.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SpaceBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SpaceAfter.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SpaceAfter());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TabStopList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TabStopList());
             builder.AddElement<TextParagraphPropertiesType>()
                 .AddAttribute("marL", a => a.LeftMargin, aBuilder =>
                 {
@@ -29796,28 +29796,28 @@ public StringValue? Bookmark
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RightToLeft>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Highlight>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnMouseOver>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LatinFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EastAsianFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ComplexScriptFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SymbolFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.UnderlineFillText>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.UnderlineFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.UnderlineFollowsText>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RightToLeft.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RightToLeft());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Highlight.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Highlight());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnMouseOver.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnMouseOver());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LatinFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LatinFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EastAsianFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EastAsianFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ComplexScriptFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ComplexScriptFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SymbolFont.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SymbolFont());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.UnderlineFillText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.UnderlineFillText());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.UnderlineFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.UnderlineFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.UnderlineFollowsText.ElementType, static () => new DocumentFormat.OpenXml.Drawing.UnderlineFollowsText());
             builder.AddElement<TextCharacterPropertiesType>()
                 .AddAttribute("kumimoji", a => a.Kumimoji)
                 .AddAttribute("lang", a => a.Language)
@@ -29931,12 +29931,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EndParagraphRunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Field>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Break>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.TextMath>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Run.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EndParagraphRunProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EndParagraphRunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Field.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Field());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Break.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Break());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.TextMath.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.TextMath());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ParagraphProperties.ElementType, 0, 1),
@@ -30371,8 +30371,8 @@ protected TextSpacingType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SpacingPercent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SpacingPoints>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SpacingPercent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SpacingPercent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SpacingPoints.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SpacingPoints());
         }
 
         /// <summary>
@@ -30456,7 +30456,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TabStop>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TabStop.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TabStop());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.TabStop.ElementType, 0, 32)
@@ -30579,12 +30579,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenEffectsProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenFillProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenLineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenScene3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.HiddenShape3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ShadowObscured>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenEffectsProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenEffectsProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenFillProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenFillProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenLineProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenLineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenScene3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenScene3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.HiddenShape3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.HiddenShape3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ShadowObscured.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ShadowObscured());
             builder.AddElement<ShapePropertiesExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -30671,7 +30671,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.IsCanvas>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.IsCanvas.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.IsCanvas());
             builder.AddElement<GvmlGroupShapeExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -30743,7 +30743,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtension.ElementType, 0, 0)
@@ -30809,8 +30809,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -30922,17 +30922,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TransformGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TransformGroup.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TransformGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<VisualGroupShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -31041,11 +31041,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TextShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TextShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TextShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeStyle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualShapeProperties.ElementType, 1, 1),
@@ -31182,10 +31182,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualConnectionShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualConnectionShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualConnectionShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeStyle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualConnectionShapeProperties.ElementType, 1, 1),
@@ -31309,11 +31309,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualPictureProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualPictureProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualPictureProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeStyle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualPictureProperties.ElementType, 1, 1),
@@ -31450,10 +31450,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGraphicFrameProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGraphicFrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGraphicFrameProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualGraphicFrameProperties.ElementType, 1, 1),
@@ -31582,16 +31582,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.VisualGroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TextShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.VisualGroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.VisualGroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TextShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TextShape());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.GvmlContentPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualGroupShapeProperties.ElementType, 1, 1),
@@ -31694,7 +31694,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GvmlGroupShapeExtension.ElementType, 0, 0)
@@ -31769,7 +31769,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.NonVisualGroupProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.NonVisualGroupProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.NonVisualGroupProperties());
             builder.AddElement<NonVisualGroupDrawingShapePropsExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -31851,7 +31851,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Theme.ThemeFamily>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Theme.ThemeFamily.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Theme.ThemeFamily());
             builder.AddElement<OfficeStyleSheetExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -31933,7 +31933,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
             builder.AddElement<ConnectorLockingExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -32075,7 +32075,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<GroupShapeLocks>()
                 .AddAttribute("noGrp", a => a.NoGrouping)
                 .AddAttribute("noUngrp", a => a.NoUngrouping)
@@ -32161,7 +32161,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtension.ElementType, 0, 0)
@@ -32229,10 +32229,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TextDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeDefault.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineDefault.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TextDefault.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TextDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ShapeDefault.ElementType, 0, 1),
@@ -32352,7 +32352,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtraColorScheme>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtraColorScheme.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtraColorScheme());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ExtraColorScheme.ElementType, 0, 0)
@@ -32417,7 +32417,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.CustomColor.ElementType, 0, 0)
@@ -32482,7 +32482,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.OfficeStyleSheetExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.OfficeStyleSheetExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.OfficeStyleSheetExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.OfficeStyleSheetExtension.ElementType, 0, 0)
@@ -32833,8 +32833,8 @@ public BooleanValue? EndSound
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkSound>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkSound.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkSound());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkExtensionList());
             builder.AddElement<HyperlinkType>()
                 .AddAttribute("r:id", a => a.Id)
                 .AddAttribute("invalidUrl", a => a.InvalidUrl)
@@ -32969,7 +32969,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtension.ElementType, 0, 0)
@@ -33034,7 +33034,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectorLockingExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectorLockingExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectorLockingExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ConnectorLockingExtension.ElementType, 0, 0)
@@ -33110,8 +33110,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Diagram.RecolorImages>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.DataModelExtensionBlock>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Diagram.RecolorImages.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Diagram.RecolorImages());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.DataModelExtensionBlock.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.DataModelExtensionBlock());
             builder.AddElement<DataModelExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -33194,7 +33194,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Diagram.NonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Diagram.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Diagram.NonVisualDrawingProperties());
             builder.AddElement<PtExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -33276,7 +33276,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.HyperLinkColor.HyperlinkColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.HyperLinkColor.HyperlinkColor.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.HyperLinkColor.HyperlinkColor());
             builder.AddElement<HyperlinkExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -33348,7 +33348,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.HyperlinkExtension.ElementType, 0, 0)
@@ -33423,7 +33423,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchStyleProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchStyleProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.SketchyShapes.LineSketchStyleProperties());
             builder.AddElement<LinePropertiesExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -33624,7 +33624,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LinePropertiesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LinePropertiesExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LinePropertiesExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LinePropertiesExtension.ElementType, 0, 0)
@@ -33705,13 +33705,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.CompatExtension>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.BackgroundProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.CreationId>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.PredecessorDrawingElementReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.DocumentClassification.ClassificationOutcome>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.Decorative>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.ScriptLink>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.CompatExtension.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.CompatExtension());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.BackgroundProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.BackgroundProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.CreationId.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.CreationId());
+            builder.AddChild(DocumentFormat.OpenXml.Office2016.Drawing.PredecessorDrawingElementReference.ElementType, static () => new DocumentFormat.OpenXml.Office2016.Drawing.PredecessorDrawingElementReference());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.DocumentClassification.ClassificationOutcome.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.DocumentClassification.ClassificationOutcome());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.Decorative.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.Decorative());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.ScriptLink.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Y2021.ScriptLink.ScriptLink());
             builder.AddElement<NonVisualDrawingPropertiesExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -33899,7 +33899,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<PictureLocks>()
                 .AddAttribute("noGrp", a => a.NoGrouping)
                 .AddAttribute("noSelect", a => a.NoSelection)
@@ -33989,7 +33989,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtension.ElementType, 0, 0)
@@ -34068,11 +34068,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.CameraTool>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.ObjectProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Drawing.SignatureLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Y2022.ImageFormula.ImageFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.CameraTool.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.CameraTool());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.ObjectProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.ObjectProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Drawing.SignatureLine.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Drawing.SignatureLine());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Y2022.ImageFormula.ImageFormula.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Y2022.ImageFormula.ImageFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Drawing.Livefeed.LiveFeedProperties());
             builder.AddElement<NonVisualPicturePropertiesExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -34148,7 +34148,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipExtension.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BlipExtension.ElementType, 0, 0)
@@ -34229,13 +34229,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.ImageProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.UseLocalDpi>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.PictureAttributionSourceURL>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OEmbedShared>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2019.Drawing.SVG.SVGBlip>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.Word.Y2020.OEmbed.OEmbed>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.Drawing.WebVideoProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.ImageProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.ImageProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.UseLocalDpi.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.UseLocalDpi());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.PictureAttributionSourceURL.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.PictureAttributionSourceURL());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OEmbedShared.ElementType, static () => new DocumentFormat.OpenXml.Office.Drawing.Y2021.OEmbed.OEmbedShared());
+            builder.AddChild(DocumentFormat.OpenXml.Office2019.Drawing.SVG.SVGBlip.ElementType, static () => new DocumentFormat.OpenXml.Office2019.Drawing.SVG.SVGBlip());
+            builder.AddChild(DocumentFormat.OpenXml.Office.Word.Y2020.OEmbed.OEmbed.ElementType, static () => new DocumentFormat.OpenXml.Office.Word.Y2020.OEmbed.OEmbed());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.Drawing.WebVideoProperty.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.Drawing.WebVideoProperty());
             builder.AddElement<BlipExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_picture.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_picture.g.cs
index 30b130333..f3d2abe0f 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_picture.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_picture.g.cs
@@ -76,11 +76,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Pictures.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Pictures.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Pictures.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.Pictures.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Pictures.NonVisualPictureProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Pictures.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Pictures.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Pictures.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Pictures.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Pictures.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Pictures.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.Pictures.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.Pictures.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Pictures.NonVisualPictureProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Pictures.NonVisualPictureProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Pictures.NonVisualPictureProperties.ElementType, 1, 1),
@@ -266,9 +266,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -398,8 +398,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PictureLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PictureLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PictureLocks());
             builder.AddElement<NonVisualPictureDrawingProperties>()
                 .AddAttribute("preferRelativeResize", a => a.PreferRelativeResize);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -494,8 +494,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Pictures.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Pictures.NonVisualPictureDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Pictures.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Pictures.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Pictures.NonVisualPictureDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Pictures.NonVisualPictureDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Pictures.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -610,10 +610,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SourceRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Stretch>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tile>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SourceRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SourceRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Stretch.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Stretch());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tile());
             builder.AddElement<BlipFill>()
                 .AddAttribute("dpi", a => a.Dpi)
                 .AddAttribute("rotWithShape", a => a.RotateWithShape);
@@ -740,21 +740,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_spreadsheetDrawing.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_spreadsheetDrawing.g.cs
index 580e0edf9..11c1d5fa9 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_spreadsheetDrawing.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_spreadsheetDrawing.g.cs
@@ -91,15 +91,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.FromMarker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ToMarker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.FromMarker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.FromMarker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ToMarker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ToMarker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart());
             builder.AddElement<TwoCellAnchor>()
                 .AddAttribute("editAs", a => a.EditAs, aBuilder =>
                 {
@@ -220,15 +220,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Extent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.FromMarker>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Extent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Extent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.FromMarker.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.FromMarker());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Spreadsheet.FromMarker.ElementType, 1, 1),
@@ -344,15 +344,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Extent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Position.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Extent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Extent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ClientData());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ContentPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Spreadsheet.Position.ElementType, 1, 1),
@@ -503,10 +503,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.TextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.TextBody.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.TextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualShapeProperties());
             builder.AddElement<Shape>()
                 .AddAttribute("macro", a => a.Macro)
                 .AddAttribute("textlink", a => a.TextLink)
@@ -639,14 +639,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.ContentPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.ContentPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGroupShapeProperties.ElementType, 1, 1),
@@ -769,9 +769,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.Transform>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGraphicFrameProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.Transform.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.Transform());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGraphicFrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGraphicFrameProperties());
             builder.AddElement<GraphicFrame>()
                 .AddAttribute("macro", a => a.Macro)
                 .AddAttribute("fPublished", a => a.Published);
@@ -903,9 +903,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualConnectionShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualConnectionShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualConnectionShapeProperties());
             builder.AddElement<ConnectionShape>()
                 .AddAttribute("macro", a => a.Macro)
                 .AddAttribute("fPublished", a => a.Published);
@@ -1038,10 +1038,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualPictureProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualPictureProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualPictureProperties());
             builder.AddElement<Picture>()
                 .AddAttribute("macro", a => a.Macro)
                 .AddAttribute("fPublished", a => a.Published);
@@ -1191,10 +1191,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.OfficeArtExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.Transform2D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.ApplicationNonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Drawing.ExcelNonVisualContentPartShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.OfficeArtExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.OfficeArtExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.Transform2D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.ApplicationNonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Drawing.ExcelNonVisualContentPartShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Drawing.ExcelNonVisualContentPartShapeProperties());
             builder.AddElement<ContentPart>()
                 .AddAttribute("r:id", a => a.RelationshipId, aBuilder =>
                 {
@@ -1325,9 +1325,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.AbsoluteAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.OneCellAnchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.TwoCellAnchor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.AbsoluteAnchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.AbsoluteAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.OneCellAnchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.OneCellAnchor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.TwoCellAnchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.TwoCellAnchor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -1432,8 +1432,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualShapeDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualShapeDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -1549,21 +1549,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -1681,10 +1681,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, 1, 1),
@@ -1806,9 +1806,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, 1, 1),
@@ -1902,8 +1902,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualConnectorShapeDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualConnectorShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualConnectorShapeDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -1996,8 +1996,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualPictureDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualPictureDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualPictureDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -2102,10 +2102,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SourceRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Stretch>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tile>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SourceRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SourceRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Stretch.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Stretch());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tile());
             builder.AddElement<BlipFill>()
                 .AddAttribute("rotWithShape", a => a.RotateWithShape);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -2208,8 +2208,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGraphicFrameDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGraphicFrameDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGraphicFrameDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -2332,8 +2332,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -2747,10 +2747,10 @@ protected MarkerType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.RowOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.RowId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.RowOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.RowOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.RowId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.RowId());
         }
 
         /// <summary>
@@ -3087,9 +3087,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -3219,8 +3219,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeLocks());
             builder.AddElement<NonVisualShapeDrawingProperties>()
                 .AddAttribute("txBox", a => a.TextBox);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -3317,10 +3317,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.StartConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EndConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.StartConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.StartConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EndConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EndConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, 0, 1),
@@ -3451,8 +3451,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PictureLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PictureLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PictureLocks());
             builder.AddElement<NonVisualPictureDrawingProperties>()
                 .AddAttribute("preferRelativeResize", a => a.PreferRelativeResize);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -3547,8 +3547,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicFrameLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicFrameLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, 0, 1),
@@ -3641,8 +3641,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, 0, 1),
@@ -3735,8 +3735,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGroupShapeDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGroupShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualGroupShapeDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Spreadsheet.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -3848,17 +3848,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TransformGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TransformGroup.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TransformGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<GroupShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_wordprocessingDrawing.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_wordprocessingDrawing.g.cs
index 2436a8d01..1881b6a6a 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_wordprocessingDrawing.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_drawingml_2006_wordprocessingDrawing.g.cs
@@ -153,7 +153,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent());
             builder.AddElement<WrapSquare>()
                 .AddAttribute("wrapText", a => a.WrapText, aBuilder =>
                 {
@@ -271,7 +271,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapPolygon>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapPolygon.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapPolygon());
             builder.AddElement<WrapTight>()
                 .AddAttribute("wrapText", a => a.WrapText, aBuilder =>
                 {
@@ -387,7 +387,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapPolygon>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapPolygon.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapPolygon());
             builder.AddElement<WrapThrough>()
                 .AddAttribute("wrapText", a => a.WrapText, aBuilder =>
                 {
@@ -493,7 +493,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent());
             builder.AddElement<WrapTopBottom>()
                 .AddAttribute("distT", a => a.DistanceFromTop)
                 .AddAttribute("distB", a => a.DistanceFromBottom);
@@ -644,11 +644,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.DocProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.NonVisualGraphicFrameDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.Extent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.DocProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.DocProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.NonVisualGraphicFrameDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.NonVisualGraphicFrameDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.Extent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.Extent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent());
             builder.AddElement<Inline>()
                 .AddAttribute("distT", a => a.DistanceFromTop)
                 .AddAttribute("distB", a => a.DistanceFromBottom)
@@ -947,21 +947,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.DocProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.NonVisualGraphicFrameDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.SimplePosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.Extent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.HorizontalPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.VerticalPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapNone>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapSquare>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapThrough>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapTight>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapTopBottom>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeHeight>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.DocProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.DocProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.NonVisualGraphicFrameDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.NonVisualGraphicFrameDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.SimplePosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.SimplePosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.Extent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.Extent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.EffectExtent());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.HorizontalPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.HorizontalPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.VerticalPosition.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.VerticalPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapNone.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapNone());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapSquare.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapSquare());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapThrough.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapThrough());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapTight.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapTight());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapTopBottom.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.WrapTopBottom());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeWidth.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeHeight.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.RelativeHeight());
             builder.AddElement<Anchor>()
                 .AddAttribute("distT", a => a.DistanceFromTop)
                 .AddAttribute("distB", a => a.DistanceFromBottom)
@@ -1400,8 +1400,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.StartPoint>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.LineTo>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.StartPoint.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.StartPoint());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.LineTo.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.LineTo());
             builder.AddElement<WrapPolygon>()
                 .AddAttribute("edited", a => a.Edited);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1494,9 +1494,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionHeightOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.HorizontalAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.PositionOffset>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionHeightOffset.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionHeightOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.HorizontalAlignment.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.HorizontalAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.PositionOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.PositionOffset());
             builder.AddElement<HorizontalPosition>()
                 .AddAttribute("relativeFrom", a => a.RelativeFrom, aBuilder =>
                 {
@@ -1623,9 +1623,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionVerticalOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.VerticalAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.PositionOffset>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionVerticalOffset.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Drawing.PercentagePositionVerticalOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.VerticalAlignment.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.VerticalAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.PositionOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.PositionOffset());
             builder.AddElement<VerticalPosition>()
                 .AddAttribute("relativeFrom", a => a.RelativeFrom, aBuilder =>
                 {
@@ -1853,9 +1853,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<DocProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -1975,8 +1975,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicFrameLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicFrameLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, 0, 1),
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_bibliography.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_bibliography.g.cs
index 2e40d7499..2dce0fe80 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_bibliography.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_bibliography.g.cs
@@ -100,7 +100,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Source>();
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Source.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Source());
             builder.AddElement<Sources>()
                 .AddAttribute("SelectedStyle", a => a.SelectedStyle, aBuilder =>
                 {
@@ -180,9 +180,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Last>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.First>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Middle>();
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Last.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Last());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.First.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.First());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Middle.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Middle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Bibliography.Last.ElementType, 0, 0),
@@ -2625,7 +2625,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Person>();
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Person.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Person());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Bibliography.Person.ElementType, 1, 0)
@@ -3585,7 +3585,7 @@ protected NameType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.NameList>();
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.NameList.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.NameList());
         }
 
         /// <summary>
@@ -3794,8 +3794,8 @@ protected NameOrCorporateType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.NameList>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Corporate>();
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.NameList.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.NameList());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Corporate.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Corporate());
         }
 
         /// <summary>
@@ -3894,22 +3894,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Author>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Performer>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Artist>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.BookAuthor>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Compiler>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Composer>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Conductor>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Counsel>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Director>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Editor>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Interviewee>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Interviewer>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Inventor>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.ProducerName>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Translator>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Writer>();
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Author.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Author());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Performer.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Performer());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Artist.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Artist());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.BookAuthor.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.BookAuthor());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Compiler.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Compiler());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Composer.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Composer());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Conductor.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Conductor());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Counsel.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Counsel());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Director.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Director());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Editor.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Editor());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Interviewee.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Interviewee());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Interviewer.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Interviewer());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Inventor.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Inventor());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.ProducerName.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.ProducerName());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Translator.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Translator());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Writer.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Writer());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
@@ -4295,58 +4295,58 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.AuthorList>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.SourceType>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.AbbreviatedCaseNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.AlbumTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.BookTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Broadcaster>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.BroadcastTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.CaseNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.ChapterNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.City>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Comments>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.ConferenceName>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.CountryRegion>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Court>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Day>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.DayAccessed>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Department>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Distributor>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Edition>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.GuidString>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Institution>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.InternetSiteTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Issue>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.JournalName>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.LcId>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Medium>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Month>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.MonthAccessed>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.NumberVolumes>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Pages>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.PatentNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.PeriodicalTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.ProductionCompany>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.PublicationTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Publisher>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.RecordingNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.ReferenceOrder>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Reporter>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.ShortTitle>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.StandardNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.StateProvince>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Station>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Tag>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Theater>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.ThesisType>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Title>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.PatentType>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.UrlString>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Version>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Volume>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.Year>();
-            builder.AddChild<DocumentFormat.OpenXml.Bibliography.YearAccessed>();
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.AuthorList.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.AuthorList());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.SourceType.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.SourceType());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.AbbreviatedCaseNumber.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.AbbreviatedCaseNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.AlbumTitle.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.AlbumTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.BookTitle.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.BookTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Broadcaster.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Broadcaster());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.BroadcastTitle.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.BroadcastTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.CaseNumber.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.CaseNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.ChapterNumber.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.ChapterNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.City.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.City());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Comments.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Comments());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.ConferenceName.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.ConferenceName());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.CountryRegion.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.CountryRegion());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Court.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Court());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Day.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Day());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.DayAccessed.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.DayAccessed());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Department.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Department());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Distributor.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Distributor());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Edition.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Edition());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.GuidString.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.GuidString());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Institution.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Institution());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.InternetSiteTitle.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.InternetSiteTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Issue.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Issue());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.JournalName.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.JournalName());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.LcId.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.LcId());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Medium.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Medium());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Month.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Month());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.MonthAccessed.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.MonthAccessed());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.NumberVolumes.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.NumberVolumes());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Pages.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Pages());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.PatentNumber.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.PatentNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.PeriodicalTitle.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.PeriodicalTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.ProductionCompany.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.ProductionCompany());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.PublicationTitle.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.PublicationTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Publisher.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Publisher());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.RecordingNumber.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.RecordingNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.ReferenceOrder.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.ReferenceOrder());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Reporter.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Reporter());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.ShortTitle.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.ShortTitle());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.StandardNumber.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.StandardNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.StateProvince.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.StateProvince());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Station.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Station());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Tag.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Tag());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Theater.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Theater());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.ThesisType.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.ThesisType());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Title.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Title());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.PatentType.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.PatentType());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.UrlString.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.UrlString());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Version.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Version());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Volume.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Volume());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.Year.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.Year());
+            builder.AddChild(DocumentFormat.OpenXml.Bibliography.YearAccessed.ElementType, static () => new DocumentFormat.OpenXml.Bibliography.YearAccessed());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_characteristics.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_characteristics.g.cs
index a202aca55..5c5e66d53 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_characteristics.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_characteristics.g.cs
@@ -70,7 +70,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.AdditionalCharacteristics.Characteristic>();
+            builder.AddChild(DocumentFormat.OpenXml.AdditionalCharacteristics.Characteristic.ElementType, static () => new DocumentFormat.OpenXml.AdditionalCharacteristics.Characteristic());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.AdditionalCharacteristics.Characteristic.ElementType, 0, 0)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_custom-properties.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_custom-properties.g.cs
index a9ed59b87..232ce53d6 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_custom-properties.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_custom-properties.g.cs
@@ -72,7 +72,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.CustomProperties.CustomDocumentProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.CustomProperties.CustomDocumentProperty.ElementType, static () => new DocumentFormat.OpenXml.CustomProperties.CustomDocumentProperty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.CustomProperties.CustomDocumentProperty.ElementType, 0, 0)
@@ -241,40 +241,40 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTArray>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTClipboardData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTNull>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTVector>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTVStreamData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTClassId>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTCurrency>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTError>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBlob>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTOBlob>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTStreamData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTOStreamData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTStorage>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTOStorage>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBool>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTByte>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDate>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTFileTime>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDecimal>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDouble>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTFloat>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInt32>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInteger>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInt64>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTShort>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTLPSTR>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTLPWSTR>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBString>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort>();
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTArray.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTArray());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTClipboardData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTClipboardData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTEmpty.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTNull.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTNull());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTVector.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTVector());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTVStreamData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTVStreamData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTClassId.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTClassId());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTCurrency.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTCurrency());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTError.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTError());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBlob.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBlob());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTOBlob.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTOBlob());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTStreamData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTStreamData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTOStreamData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTOStreamData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTStorage.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTStorage());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTOStorage.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTOStorage());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBool.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBool());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTByte.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTByte());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDate.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDate());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTFileTime.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTFileTime());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDecimal.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDecimal());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDouble.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDouble());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTFloat.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTFloat());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInt32.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInt32());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInteger.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInteger());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInt64.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInt64());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTShort.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTShort());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTLPSTR.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTLPSTR());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTLPWSTR.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTLPWSTR());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBString.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBString());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort());
             builder.AddElement<CustomDocumentProperty>()
                 .AddAttribute("fmtid", a => a.FormatId, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_customXml.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_customXml.g.cs
index 1f1dfd2b1..10c25d56d 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_customXml.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_customXml.g.cs
@@ -83,7 +83,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.CustomXmlDataProperties.SchemaReferences>();
+            builder.AddChild(DocumentFormat.OpenXml.CustomXmlDataProperties.SchemaReferences.ElementType, static () => new DocumentFormat.OpenXml.CustomXmlDataProperties.SchemaReferences());
             builder.AddElement<DataStoreItem>()
                 .AddAttribute("ds:itemID", a => a.ItemId, aBuilder =>
                 {
@@ -246,7 +246,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.CustomXmlDataProperties.SchemaReference>();
+            builder.AddChild(DocumentFormat.OpenXml.CustomXmlDataProperties.SchemaReference.ElementType, static () => new DocumentFormat.OpenXml.CustomXmlDataProperties.SchemaReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.CustomXmlDataProperties.SchemaReference.ElementType, 0, 0)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_docPropsVTypes.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_docPropsVTypes.g.cs
index 0fb250c20..61647199a 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_docPropsVTypes.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_docPropsVTypes.g.cs
@@ -105,41 +105,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTArray>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTClipboardData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTNull>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.Variant>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTVector>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTVStreamData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTClassId>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTCurrency>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTError>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBlob>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTOBlob>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTStreamData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTOStreamData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTStorage>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTOStorage>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBool>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTByte>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDate>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTFileTime>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDecimal>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDouble>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTFloat>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInt32>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInteger>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInt64>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTShort>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTLPSTR>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTLPWSTR>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBString>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort>();
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTArray.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTArray());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTClipboardData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTClipboardData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTEmpty.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTNull.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTNull());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.Variant.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.Variant());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTVector.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTVector());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTVStreamData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTVStreamData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTClassId.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTClassId());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTCurrency.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTCurrency());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTError.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTError());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBlob.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBlob());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTOBlob.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTOBlob());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTStreamData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTStreamData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTOStreamData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTOStreamData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTStorage.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTStorage());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTOStorage.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTOStorage());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBool.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBool());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTByte.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTByte());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDate.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDate());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTFileTime.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTFileTime());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDecimal.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDecimal());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDouble.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDouble());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTFloat.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTFloat());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInt32.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInt32());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInteger.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInteger());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInt64.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInt64());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTShort.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTShort());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTLPSTR.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTLPSTR());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTLPWSTR.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTLPWSTR());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBString.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBString());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.VariantTypes.Variant.ElementType, 1, 1),
@@ -733,27 +733,27 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTClipboardData>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.Variant>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTClassId>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTCurrency>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTError>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBool>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTByte>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDate>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTFileTime>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDouble>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTFloat>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInt32>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInt64>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTShort>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTLPSTR>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTLPWSTR>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBString>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort>();
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTClipboardData.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTClipboardData());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.Variant.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.Variant());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTClassId.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTClassId());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTCurrency.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTCurrency());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTError.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTError());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBool.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBool());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTByte.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTByte());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDate.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDate());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTFileTime.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTFileTime());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDouble.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDouble());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTFloat.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTFloat());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInt32.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInt32());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInt64.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInt64());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTShort.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTShort());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTLPSTR.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTLPSTR());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTLPWSTR.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTLPWSTR());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBString.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBString());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt64());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort());
             builder.AddElement<VTVector>()
                 .AddAttribute("baseType", a => a.BaseType, aBuilder =>
                 {
@@ -893,23 +893,23 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.Variant>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTCurrency>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTError>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBool>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTByte>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDate>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDecimal>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTDouble>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTFloat>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInt32>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTInteger>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTShort>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBString>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger>();
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort>();
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.Variant.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.Variant());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTCurrency.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTCurrency());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTError.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTError());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBool.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBool());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTByte.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTByte());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDate.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDate());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDecimal.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDecimal());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTDouble.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTDouble());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTFloat.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTFloat());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInt32.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInt32());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTInteger.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTInteger());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTShort.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTShort());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBString.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBString());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedByte());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInt32());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedInteger());
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTUnsignedShort());
             builder.AddElement<VTArray>()
                 .AddAttribute("lBound", a => a.LowerBounds, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_extended-properties.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_extended-properties.g.cs
index 181dd91df..e5bc9724f 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_extended-properties.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_extended-properties.g.cs
@@ -97,33 +97,33 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.DigitalSignature>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.TitlesOfParts>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.HeadingPairs>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.HyperlinkList>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.ScaleCrop>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.LinksUpToDate>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.SharedDocument>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.HyperlinksChanged>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Pages>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Words>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Characters>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Lines>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Paragraphs>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Slides>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Notes>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.TotalTime>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.HiddenSlides>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.MultimediaClips>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.CharactersWithSpaces>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.DocumentSecurity>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Template>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Manager>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Company>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.PresentationFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.HyperlinkBase>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.Application>();
-            builder.AddChild<DocumentFormat.OpenXml.ExtendedProperties.ApplicationVersion>();
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.DigitalSignature.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.DigitalSignature());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.TitlesOfParts.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.TitlesOfParts());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.HeadingPairs.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.HeadingPairs());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.HyperlinkList.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.HyperlinkList());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.ScaleCrop.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.ScaleCrop());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.LinksUpToDate.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.LinksUpToDate());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.SharedDocument.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.SharedDocument());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.HyperlinksChanged.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.HyperlinksChanged());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Pages.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Pages());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Words.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Words());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Characters.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Characters());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Lines.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Lines());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Paragraphs.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Paragraphs());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Slides.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Slides());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Notes.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Notes());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.TotalTime.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.TotalTime());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.HiddenSlides.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.HiddenSlides());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.MultimediaClips.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.MultimediaClips());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.CharactersWithSpaces.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.CharactersWithSpaces());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.DocumentSecurity.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.DocumentSecurity());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Template.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Template());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Manager.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Manager());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Company.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Company());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.PresentationFormat.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.PresentationFormat());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.HyperlinkBase.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.HyperlinkBase());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.Application.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.Application());
+            builder.AddChild(DocumentFormat.OpenXml.ExtendedProperties.ApplicationVersion.ElementType, static () => new DocumentFormat.OpenXml.ExtendedProperties.ApplicationVersion());
             builder.Particle = new CompositeParticle.Builder(ParticleType.All, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.ExtendedProperties.Template.ElementType, 0, 1),
@@ -1728,7 +1728,7 @@ protected VectorVariantType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTVector>();
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTVector.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTVector());
         }
 
         /// <summary>
@@ -1799,7 +1799,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTVector>();
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTVector.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTVector());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.VariantTypes.VTVector.ElementType, 1, 1)
@@ -1877,7 +1877,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.VariantTypes.VTBlob>();
+            builder.AddChild(DocumentFormat.OpenXml.VariantTypes.VTBlob.ElementType, static () => new DocumentFormat.OpenXml.VariantTypes.VTBlob());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.VariantTypes.VTBlob.ElementType, 1, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_math.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_math.g.cs
index 13bc8575f..9984b7147 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_math.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_officeDocument_2006_math.g.cs
@@ -201,41 +201,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.RunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Text>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Break>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoBreakHyphen>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SoftHyphen>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DayShort>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MonthShort>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.YearShort>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DayLong>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MonthLong>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.YearLong>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AnnotationReferenceMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteReferenceMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnoteReferenceMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SeparatorMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContinuationSeparatorMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CarriageReturn>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TabChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LastRenderedPageBreak>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FieldChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnoteReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EmbeddedObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PositionalTab>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Ruby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SymbolChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Text>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FieldCode>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedFieldCode>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.RunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Text.ElementType, static () => new DocumentFormat.OpenXml.Math.Text());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Break.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Break());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoBreakHyphen.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoBreakHyphen());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SoftHyphen.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SoftHyphen());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DayShort.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DayShort());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MonthShort.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MonthShort());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.YearShort.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.YearShort());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DayLong.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DayLong());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MonthLong.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MonthLong());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.YearLong.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.YearLong());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AnnotationReferenceMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AnnotationReferenceMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteReferenceMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteReferenceMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnoteReferenceMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnoteReferenceMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SeparatorMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SeparatorMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContinuationSeparatorMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContinuationSeparatorMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageNumber.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CarriageReturn.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CarriageReturn());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TabChar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TabChar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LastRenderedPageBreak.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LastRenderedPageBreak());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FieldChar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FieldChar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnoteReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnoteReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EmbeddedObject.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EmbeddedObject());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Picture.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PositionalTab.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PositionalTab());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Ruby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Ruby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SymbolChar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SymbolChar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Text.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Text());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FieldCode.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FieldCode());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedFieldCode.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedFieldCode());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.RunProperties.ElementType, 0, 1),
@@ -376,8 +376,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.AccentProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.AccentProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.AccentProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.AccentProperties.ElementType, 0, 1),
@@ -470,8 +470,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.BarProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.BarProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.BarProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.BarProperties.ElementType, 0, 1),
@@ -564,8 +564,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.BoxProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.BoxProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.BoxProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.BoxProperties.ElementType, 0, 1),
@@ -658,8 +658,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBoxProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBoxProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBoxProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.BorderBoxProperties.ElementType, 0, 1),
@@ -752,8 +752,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.DelimiterProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.DelimiterProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.DelimiterProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.DelimiterProperties.ElementType, 0, 1),
@@ -833,8 +833,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArrayProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArrayProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArrayProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.EquationArrayProperties.ElementType, 0, 1),
@@ -915,9 +915,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.FractionProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Numerator>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Denominator>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.FractionProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.FractionProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Numerator.ElementType, static () => new DocumentFormat.OpenXml.Math.Numerator());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Denominator.ElementType, static () => new DocumentFormat.OpenXml.Math.Denominator());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.FractionProperties.ElementType, 0, 1),
@@ -1025,9 +1025,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.FunctionProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.FunctionName>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.FunctionProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.FunctionProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.FunctionName.ElementType, static () => new DocumentFormat.OpenXml.Math.FunctionName());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.FunctionProperties.ElementType, 0, 1),
@@ -1134,8 +1134,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupCharProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupCharProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupCharProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.GroupCharProperties.ElementType, 0, 1),
@@ -1229,9 +1229,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLowerProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Limit>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLowerProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLowerProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Limit.ElementType, static () => new DocumentFormat.OpenXml.Math.Limit());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.LimitLowerProperties.ElementType, 0, 1),
@@ -1339,9 +1339,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpperProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Limit>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpperProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpperProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Limit.ElementType, static () => new DocumentFormat.OpenXml.Math.Limit());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.LimitUpperProperties.ElementType, 0, 1),
@@ -1448,8 +1448,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.MatrixProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MatrixRow>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.MatrixProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.MatrixProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MatrixRow.ElementType, static () => new DocumentFormat.OpenXml.Math.MatrixRow());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.MatrixProperties.ElementType, 0, 1),
@@ -1531,10 +1531,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.NaryProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SuperArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.NaryProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.NaryProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.SubArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SuperArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.SuperArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.NaryProperties.ElementType, 0, 1),
@@ -1655,8 +1655,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PhantomProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PhantomProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.PhantomProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.PhantomProperties.ElementType, 0, 1),
@@ -1750,9 +1750,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Degree>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.RadicalProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Degree.ElementType, static () => new DocumentFormat.OpenXml.Math.Degree());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
+            builder.AddChild(DocumentFormat.OpenXml.Math.RadicalProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.RadicalProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.RadicalProperties.ElementType, 0, 1),
@@ -1861,10 +1861,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SuperArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuperProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.SubArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SuperArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.SuperArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuperProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuperProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.PreSubSuperProperties.ElementType, 0, 1),
@@ -1986,9 +1986,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubscriptProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.SubArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubscriptProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.SubscriptProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.SubscriptProperties.ElementType, 0, 1),
@@ -2097,10 +2097,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SuperArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscriptProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.SubArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SuperArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.SuperArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscriptProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscriptProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.SubSuperscriptProperties.ElementType, 0, 1),
@@ -2222,9 +2222,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SuperArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SuperscriptProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SuperArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.SuperArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SuperscriptProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.SuperscriptProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.SuperscriptProperties.ElementType, 0, 1),
@@ -2363,40 +2363,40 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ParagraphProperties.ElementType, 0, 1),
@@ -2619,62 +2619,62 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -2925,22 +2925,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.BreakBinary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BreakBinarySubtraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.IntegralLimitLocation>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.NaryLimitLocation>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.DefaultJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SmallFraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.DisplayDefaults>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.WrapRight>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LeftMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.RightMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PostSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.InterSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.IntraSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.WrapIndent>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.BreakBinary.ElementType, static () => new DocumentFormat.OpenXml.Math.BreakBinary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BreakBinarySubtraction.ElementType, static () => new DocumentFormat.OpenXml.Math.BreakBinarySubtraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFont.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFont());
+            builder.AddChild(DocumentFormat.OpenXml.Math.IntegralLimitLocation.ElementType, static () => new DocumentFormat.OpenXml.Math.IntegralLimitLocation());
+            builder.AddChild(DocumentFormat.OpenXml.Math.NaryLimitLocation.ElementType, static () => new DocumentFormat.OpenXml.Math.NaryLimitLocation());
+            builder.AddChild(DocumentFormat.OpenXml.Math.DefaultJustification.ElementType, static () => new DocumentFormat.OpenXml.Math.DefaultJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SmallFraction.ElementType, static () => new DocumentFormat.OpenXml.Math.SmallFraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.DisplayDefaults.ElementType, static () => new DocumentFormat.OpenXml.Math.DisplayDefaults());
+            builder.AddChild(DocumentFormat.OpenXml.Math.WrapRight.ElementType, static () => new DocumentFormat.OpenXml.Math.WrapRight());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LeftMargin.ElementType, static () => new DocumentFormat.OpenXml.Math.LeftMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Math.RightMargin.ElementType, static () => new DocumentFormat.OpenXml.Math.RightMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSpacing.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PostSpacing.ElementType, static () => new DocumentFormat.OpenXml.Math.PostSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Math.InterSpacing.ElementType, static () => new DocumentFormat.OpenXml.Math.InterSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Math.IntraSpacing.ElementType, static () => new DocumentFormat.OpenXml.Math.IntraSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Math.WrapIndent.ElementType, static () => new DocumentFormat.OpenXml.Math.WrapIndent());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.MathFont.ElementType, 0, 1),
@@ -4190,12 +4190,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Break>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Literal>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.NormalText>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Alignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Script>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Style>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Break.ElementType, static () => new DocumentFormat.OpenXml.Math.Break());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Literal.ElementType, static () => new DocumentFormat.OpenXml.Math.Literal());
+            builder.AddChild(DocumentFormat.OpenXml.Math.NormalText.ElementType, static () => new DocumentFormat.OpenXml.Math.NormalText());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Alignment.ElementType, static () => new DocumentFormat.OpenXml.Math.Alignment());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Script.ElementType, static () => new DocumentFormat.OpenXml.Math.Script());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Style.ElementType, static () => new DocumentFormat.OpenXml.Math.Style());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.Literal.ElementType, 0, 1),
@@ -4517,11 +4517,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedMathControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromMathControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToMathControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedMathControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedMathControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromMathControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromMathControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToMathControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToMathControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -4615,8 +4615,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.AccentChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.AccentChar.ElementType, static () => new DocumentFormat.OpenXml.Math.AccentChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.AccentChar.ElementType, 0, 1),
@@ -7116,64 +7116,64 @@ protected OfficeMathArgumentType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ArgumentProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ArgumentProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ArgumentProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
         }
 
         /// <summary>
@@ -7349,8 +7349,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Position>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Position.ElementType, static () => new DocumentFormat.OpenXml.Math.Position());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.Position.ElementType, 0, 1),
@@ -7447,12 +7447,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Break>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OperatorEmulator>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.NoBreak>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Differential>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Alignment>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Break.ElementType, static () => new DocumentFormat.OpenXml.Math.Break());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OperatorEmulator.ElementType, static () => new DocumentFormat.OpenXml.Math.OperatorEmulator());
+            builder.AddChild(DocumentFormat.OpenXml.Math.NoBreak.ElementType, static () => new DocumentFormat.OpenXml.Math.NoBreak());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Differential.ElementType, static () => new DocumentFormat.OpenXml.Math.Differential());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Alignment.ElementType, static () => new DocumentFormat.OpenXml.Math.Alignment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.OperatorEmulator.ElementType, 0, 1),
@@ -7608,15 +7608,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.HideTop>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.HideBottom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.HideLeft>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.HideRight>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.StrikeHorizontal>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.StrikeVertical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.StrikeBottomLeftToTopRight>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.StrikeTopLeftToBottomRight>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.HideTop.ElementType, static () => new DocumentFormat.OpenXml.Math.HideTop());
+            builder.AddChild(DocumentFormat.OpenXml.Math.HideBottom.ElementType, static () => new DocumentFormat.OpenXml.Math.HideBottom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.HideLeft.ElementType, static () => new DocumentFormat.OpenXml.Math.HideLeft());
+            builder.AddChild(DocumentFormat.OpenXml.Math.HideRight.ElementType, static () => new DocumentFormat.OpenXml.Math.HideRight());
+            builder.AddChild(DocumentFormat.OpenXml.Math.StrikeHorizontal.ElementType, static () => new DocumentFormat.OpenXml.Math.StrikeHorizontal());
+            builder.AddChild(DocumentFormat.OpenXml.Math.StrikeVertical.ElementType, static () => new DocumentFormat.OpenXml.Math.StrikeVertical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.StrikeBottomLeftToTopRight.ElementType, static () => new DocumentFormat.OpenXml.Math.StrikeBottomLeftToTopRight());
+            builder.AddChild(DocumentFormat.OpenXml.Math.StrikeTopLeftToBottomRight.ElementType, static () => new DocumentFormat.OpenXml.Math.StrikeTopLeftToBottomRight());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.HideTop.ElementType, 0, 1),
@@ -7859,12 +7859,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.BeginChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SeparatorChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EndChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GrowOperators>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Shape>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.BeginChar.ElementType, static () => new DocumentFormat.OpenXml.Math.BeginChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SeparatorChar.ElementType, static () => new DocumentFormat.OpenXml.Math.SeparatorChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EndChar.ElementType, static () => new DocumentFormat.OpenXml.Math.EndChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GrowOperators.ElementType, static () => new DocumentFormat.OpenXml.Math.GrowOperators());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Shape.ElementType, static () => new DocumentFormat.OpenXml.Math.Shape());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.BeginChar.ElementType, 0, 1),
@@ -8274,12 +8274,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MaxDistribution>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ObjectDistribution>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.RowSpacingRule>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.RowSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BaseJustification>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MaxDistribution.ElementType, static () => new DocumentFormat.OpenXml.Math.MaxDistribution());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ObjectDistribution.ElementType, static () => new DocumentFormat.OpenXml.Math.ObjectDistribution());
+            builder.AddChild(DocumentFormat.OpenXml.Math.RowSpacingRule.ElementType, static () => new DocumentFormat.OpenXml.Math.RowSpacingRule());
+            builder.AddChild(DocumentFormat.OpenXml.Math.RowSpacing.ElementType, static () => new DocumentFormat.OpenXml.Math.RowSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BaseJustification.ElementType, static () => new DocumentFormat.OpenXml.Math.BaseJustification());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.BaseJustification.ElementType, 0, 1),
@@ -8476,8 +8476,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.FractionType>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.FractionType.ElementType, static () => new DocumentFormat.OpenXml.Math.FractionType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.FractionType.ElementType, 0, 1),
@@ -8569,7 +8569,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, 0, 1)
@@ -8650,10 +8650,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.AccentChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.VerticalJustification>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.AccentChar.ElementType, static () => new DocumentFormat.OpenXml.Math.AccentChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Position.ElementType, static () => new DocumentFormat.OpenXml.Math.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Math.VerticalJustification.ElementType, static () => new DocumentFormat.OpenXml.Math.VerticalJustification());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.AccentChar.ElementType, 0, 1),
@@ -8773,7 +8773,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, 0, 1)
@@ -8851,7 +8851,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, 0, 1)
@@ -9027,8 +9027,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.MatrixColumnCount>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MatrixColumnJustification>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.MatrixColumnCount.ElementType, static () => new DocumentFormat.OpenXml.Math.MatrixColumnCount());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MatrixColumnJustification.ElementType, static () => new DocumentFormat.OpenXml.Math.MatrixColumnJustification());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.MatrixColumnCount.ElementType, 0, 1),
@@ -9120,7 +9120,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.MatrixColumnProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.MatrixColumnProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.MatrixColumnProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.MatrixColumnProperties.ElementType, 0, 1)
@@ -9483,7 +9483,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.MatrixColumn>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.MatrixColumn.ElementType, static () => new DocumentFormat.OpenXml.Math.MatrixColumn());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.MatrixColumn.ElementType, 1, 64)
@@ -9556,15 +9556,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MatrixColumns>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.HidePlaceholder>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.RowSpacingRule>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ColumnGapRule>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ColumnSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.RowSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ColumnGap>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BaseJustification>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MatrixColumns.ElementType, static () => new DocumentFormat.OpenXml.Math.MatrixColumns());
+            builder.AddChild(DocumentFormat.OpenXml.Math.HidePlaceholder.ElementType, static () => new DocumentFormat.OpenXml.Math.HidePlaceholder());
+            builder.AddChild(DocumentFormat.OpenXml.Math.RowSpacingRule.ElementType, static () => new DocumentFormat.OpenXml.Math.RowSpacingRule());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ColumnGapRule.ElementType, static () => new DocumentFormat.OpenXml.Math.ColumnGapRule());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ColumnSpacing.ElementType, static () => new DocumentFormat.OpenXml.Math.ColumnSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Math.RowSpacing.ElementType, static () => new DocumentFormat.OpenXml.Math.RowSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ColumnGap.ElementType, static () => new DocumentFormat.OpenXml.Math.ColumnGap());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BaseJustification.ElementType, static () => new DocumentFormat.OpenXml.Math.BaseJustification());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.BaseJustification.ElementType, 0, 1),
@@ -9754,7 +9754,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Base>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Base.ElementType, static () => new DocumentFormat.OpenXml.Math.Base());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.Base.ElementType, 1, 64)
@@ -9958,12 +9958,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.AccentChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLocation>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GrowOperators>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.HideSubArgument>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.HideSuperArgument>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.AccentChar.ElementType, static () => new DocumentFormat.OpenXml.Math.AccentChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLocation.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLocation());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GrowOperators.ElementType, static () => new DocumentFormat.OpenXml.Math.GrowOperators());
+            builder.AddChild(DocumentFormat.OpenXml.Math.HideSubArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.HideSubArgument());
+            builder.AddChild(DocumentFormat.OpenXml.Math.HideSuperArgument.ElementType, static () => new DocumentFormat.OpenXml.Math.HideSuperArgument());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.AccentChar.ElementType, 0, 1),
@@ -10116,12 +10116,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ShowPhantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ZeroWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ZeroAscent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.ZeroDescent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Transparent>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ShowPhantom.ElementType, static () => new DocumentFormat.OpenXml.Math.ShowPhantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ZeroWidth.ElementType, static () => new DocumentFormat.OpenXml.Math.ZeroWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ZeroAscent.ElementType, static () => new DocumentFormat.OpenXml.Math.ZeroAscent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.ZeroDescent.ElementType, static () => new DocumentFormat.OpenXml.Math.ZeroDescent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Transparent.ElementType, static () => new DocumentFormat.OpenXml.Math.Transparent());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ShowPhantom.ElementType, 0, 1),
@@ -10270,8 +10270,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.HideDegree>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.HideDegree.ElementType, static () => new DocumentFormat.OpenXml.Math.HideDegree());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.HideDegree.ElementType, 0, 1),
@@ -10363,7 +10363,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, 0, 1)
@@ -10441,7 +10441,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, 0, 1)
@@ -10520,8 +10520,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.AlignScripts>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Math.AlignScripts.ElementType, static () => new DocumentFormat.OpenXml.Math.AlignScripts());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.AlignScripts.ElementType, 0, 1),
@@ -10613,7 +10613,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ControlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.ControlProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ControlProperties.ElementType, 0, 1)
@@ -10740,7 +10740,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.ArgumentSize>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.ArgumentSize.ElementType, static () => new DocumentFormat.OpenXml.Math.ArgumentSize());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.ArgumentSize.ElementType, 0, 1)
@@ -11065,7 +11065,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Justification>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Justification.ElementType, static () => new DocumentFormat.OpenXml.Math.Justification());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Math.Justification.ElementType, 0, 1)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_presentationml_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_presentationml_2006_main.g.cs
index cfc1a356e..15efa8d47 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_presentationml_2006_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_presentationml_2006_main.g.cs
@@ -965,7 +965,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.AddElement<ColorMap>()
                 .AddAttribute("bg1", a => a.Background1, aBuilder =>
                 {
@@ -1105,8 +1105,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.OverrideColorMapping>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.MasterColorMapping>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.OverrideColorMapping.ElementType, static () => new DocumentFormat.OpenXml.Drawing.OverrideColorMapping());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.MasterColorMapping.ElementType, static () => new DocumentFormat.OpenXml.Drawing.MasterColorMapping());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -1218,14 +1218,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<BackgroundProperties>()
                 .AddAttribute("shadeToTitle", a => a.ShadeToTitle);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1326,12 +1326,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.AddElement<BackgroundStyleReference>()
                 .AddAttribute("idx", a => a.Index, aBuilder =>
                 {
@@ -1492,8 +1492,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2021;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M03.Main.Reactions());
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2022.M08.Main.TaskDetails.ElementType, 0, 1, version: FileFormatVersions.Microsoft365),
@@ -1585,7 +1585,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentAuthor>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommentAuthor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommentAuthor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommentAuthor.ElementType, 0, 0)
@@ -1681,7 +1681,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Comment>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Comment.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Comment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.Comment.ElementType, 0, 0)
@@ -1852,9 +1852,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.OleObjectEmbed>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.OleObjectLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Picture>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.OleObjectEmbed.ElementType, static () => new DocumentFormat.OpenXml.Presentation.OleObjectEmbed());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.OleObjectLink.ElementType, static () => new DocumentFormat.OpenXml.Presentation.OleObjectLink());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Picture.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Picture());
             builder.AddElement<OleObject>()
                 .AddAttribute("spid", a => a.ShapeId, aBuilder =>
                 {
@@ -2075,20 +2075,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.DefaultTextStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomerDataList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomShowList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.EmbeddedFontList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HandoutMasterIdList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Kinsoku>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ModificationVerifier>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesMasterIdList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PhotoAlbum>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PresentationExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideIdList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideMasterIdList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideSize>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesSize.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesSize());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.DefaultTextStyle.ElementType, static () => new DocumentFormat.OpenXml.Presentation.DefaultTextStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomerDataList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomerDataList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomShowList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomShowList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.EmbeddedFontList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.EmbeddedFontList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HandoutMasterIdList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HandoutMasterIdList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Kinsoku.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Kinsoku());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ModificationVerifier.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ModificationVerifier());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesMasterIdList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesMasterIdList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PhotoAlbum.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PhotoAlbum());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PresentationExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PresentationExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideIdList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideIdList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideMasterIdList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideMasterIdList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideSize.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideSize());
             builder.AddElement<Presentation>()
                 .AddAttribute("serverZoom", a => a.ServerZoom)
                 .AddAttribute("firstSlideNum", a => a.FirstSlideNum)
@@ -2401,12 +2401,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ColorMostRecentlyUsed>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HtmlPublishProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PresentationPropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PrintingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShowProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.WebProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ColorMostRecentlyUsed.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ColorMostRecentlyUsed());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HtmlPublishProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HtmlPublishProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PresentationPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PresentationPropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PrintingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PrintingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShowProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShowProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.WebProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.WebProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.HtmlPublishProperties.ElementType, 0, 1),
@@ -2619,11 +2619,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ColorMapOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideData>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Timing>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Transition>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ColorMapOverride.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ColorMapOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideData.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideData());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Timing.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Timing());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Transition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Transition());
             builder.AddElement<Slide>()
                 .AddAttribute("showMasterSp", a => a.ShowMasterShapes)
                 .AddAttribute("showMasterPhAnim", a => a.ShowMasterPlaceholderAnimations)
@@ -2864,12 +2864,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ColorMapOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideData>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideLayoutExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Timing>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Transition>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ColorMapOverride.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ColorMapOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideData.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideData());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideLayoutExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideLayoutExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Timing.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Timing());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Transition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Transition());
             builder.AddElement<SlideLayout>()
                 .AddAttribute("showMasterSp", a => a.ShowMasterShapes)
                 .AddAttribute("showMasterPhAnim", a => a.ShowMasterPlaceholderAnimations)
@@ -3081,14 +3081,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ColorMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideData>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideLayoutIdList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideMasterExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TextStyles>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Timing>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Transition>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ColorMap.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ColorMap());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideData.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideData());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideLayoutIdList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideLayoutIdList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideMasterExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideMasterExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TextStyles.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TextStyles());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Timing.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Timing());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Transition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Transition());
             builder.AddElement<SlideMaster>()
                 .AddAttribute("preserve", a => a.Preserve);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -3306,10 +3306,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ColorMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideData>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HandoutMasterExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HeaderFooter>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ColorMap.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ColorMap());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideData.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideData());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HandoutMasterExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HandoutMasterExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HeaderFooter());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonSlideData.ElementType, 1, 1),
@@ -3470,11 +3470,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ColorMap>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideData>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesMasterExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ColorMap.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ColorMap());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesStyle.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideData.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideData());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesMasterExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesMasterExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonSlideData.ElementType, 1, 1),
@@ -3667,9 +3667,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ColorMapOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideData>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ColorMapOverride.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ColorMapOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideData.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideData());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
             builder.AddElement<NotesSlide>()
                 .AddAttribute("showMasterSp", a => a.ShowMasterShapes)
                 .AddAttribute("showMasterPhAnim", a => a.ShowMasterPlaceholderAnimations);
@@ -3845,7 +3845,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<SlideSyncProperties>()
                 .AddAttribute("serverSldId", a => a.ServerSlideId, aBuilder =>
                 {
@@ -3967,7 +3967,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Tag>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Tag.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Tag());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.Tag.ElementType, 0, 0)
@@ -4090,14 +4090,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.GridSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NormalViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesTextViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.OutlineViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SorterViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideViewProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.GridSpacing.ElementType, static () => new DocumentFormat.OpenXml.Presentation.GridSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NormalViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NormalViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesTextViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesTextViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.OutlineViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.OutlineViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SorterViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SorterViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideViewProperties());
             builder.AddElement<ViewProperties>()
                 .AddAttribute("lastView", a => a.LastView, aBuilder =>
                 {
@@ -4339,9 +4339,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.Transform2D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionListModify>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualContentPartProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.Transform2D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionListModify.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ExtensionListModify());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualContentPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.NonVisualContentPartProperties());
             builder.AddElement<ContentPart>()
                 .AddAttribute("p14:bwMode", a => a.BwMode, aBuilder =>
                 {
@@ -4593,7 +4593,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Sound>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Sound.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Sound());
             builder.AddElement<StartSoundAction>()
                 .AddAttribute("loop", a => a.Loop);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -4779,11 +4779,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SoundTarget>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideTarget>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShapeTarget>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.InkTarget>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.BookmarkTarget>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SoundTarget.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SoundTarget());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideTarget.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideTarget());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShapeTarget.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShapeTarget());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.InkTarget.ElementType, static () => new DocumentFormat.OpenXml.Presentation.InkTarget());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.BookmarkTarget.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.BookmarkTarget());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.SlideTarget.ElementType, 1, 1),
@@ -5165,9 +5165,9 @@ public StringValue? Delay
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TargetElement>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.RuntimeNodeTrigger>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TimeNode>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TargetElement.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TargetElement());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.RuntimeNodeTrigger.ElementType, static () => new DocumentFormat.OpenXml.Presentation.RuntimeNodeTrigger());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TimeNode());
             builder.AddElement<TimeListConditionalType>()
                 .AddAttribute("evt", a => a.Event, aBuilder =>
                 {
@@ -5282,7 +5282,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonTimeNode>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonTimeNode());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonTimeNode.ElementType, 1, 1)
@@ -5392,9 +5392,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonTimeNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PreviousConditionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NextConditionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonTimeNode());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PreviousConditionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PreviousConditionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NextConditionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NextConditionList());
             builder.AddElement<SequenceTimeNode>()
                 .AddAttribute("concurrent", a => a.Concurrent)
                 .AddAttribute("prevAc", a => a.PreviousAction, aBuilder =>
@@ -5510,7 +5510,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonTimeNode>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonTimeNode());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonTimeNode.ElementType, 1, 1)
@@ -5652,8 +5652,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonBehavior>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TimeAnimateValueList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonBehavior());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TimeAnimateValueList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TimeAnimateValueList());
             builder.AddElement<Animate>()
                 .AddAttribute("by", a => a.By)
                 .AddAttribute("from", a => a.From)
@@ -5785,10 +5785,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.FromColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ToColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ByColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonBehavior>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.FromColor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.FromColor());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ToColor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ToColor());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ByColor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ByColor());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonBehavior());
             builder.AddElement<AnimateColor>()
                 .AddAttribute("clrSpc", a => a.ColorSpace, aBuilder =>
                 {
@@ -5948,8 +5948,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Progress>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonBehavior>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Progress.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Progress());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonBehavior());
             builder.AddElement<AnimateEffect>()
                 .AddAttribute("transition", a => a.Transition, aBuilder =>
                 {
@@ -6115,11 +6115,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonBehavior>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ByPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.FromPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ToPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.RotationCenter>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonBehavior());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ByPosition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ByPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.FromPosition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.FromPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ToPosition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ToPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.RotationCenter.ElementType, static () => new DocumentFormat.OpenXml.Presentation.RotationCenter());
             builder.AddElement<AnimateMotion>()
                 .AddAttribute("origin", a => a.Origin, aBuilder =>
                 {
@@ -6314,7 +6314,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonBehavior>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonBehavior());
             builder.AddElement<AnimateRotation>()
                 .AddAttribute("by", a => a.By)
                 .AddAttribute("from", a => a.From)
@@ -6430,10 +6430,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonBehavior>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ByPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.FromPosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ToPosition>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonBehavior());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ByPosition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ByPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.FromPosition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.FromPosition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ToPosition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ToPosition());
             builder.AddElement<AnimateScale>()
                 .AddAttribute("zoomContents", a => a.ZoomContents)
                 .AddAttribute("p14:bounceEnd", a => a.BounceEnd, aBuilder =>
@@ -6580,7 +6580,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonBehavior>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonBehavior());
             builder.AddElement<Command>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -6665,8 +6665,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ToVariantValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonBehavior>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ToVariantValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ToVariantValue());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonBehavior());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonBehavior.ElementType, 1, 1),
@@ -6768,7 +6768,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonMediaNode>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonMediaNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonMediaNode());
             builder.AddElement<Audio>()
                 .AddAttribute("isNarration", a => a.IsNarration);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -6858,7 +6858,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonMediaNode>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonMediaNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonMediaNode());
             builder.AddElement<Video>()
                 .AddAttribute("fullScrn", a => a.FullScreen);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -7186,12 +7186,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ChildTimeNodeList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SubTimeNodeList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Iterate>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.EndSync>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.StartConditionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.EndConditionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ChildTimeNodeList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ChildTimeNodeList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SubTimeNodeList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SubTimeNodeList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Iterate.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Iterate());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.EndSync.ElementType, static () => new DocumentFormat.OpenXml.Presentation.EndSync());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.StartConditionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.StartConditionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.EndConditionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.EndConditionList());
             builder.AddElement<CommonTimeNode>()
                 .AddAttribute("id", a => a.Id)
                 .AddAttribute("presetID", a => a.PresetId)
@@ -7648,7 +7648,7 @@ protected TimeListTimeConditionalListType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Condition>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Condition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Condition());
         }
     }
 
@@ -7792,7 +7792,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.AttributeName>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.AttributeName.ElementType, static () => new DocumentFormat.OpenXml.Presentation.AttributeName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.AttributeName.ElementType, 1, 0)
@@ -8201,12 +8201,12 @@ protected ColorType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
         }
 
         /// <summary>
@@ -8362,7 +8362,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.VariantValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.VariantValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.VariantValue());
             builder.AddElement<TimeAnimateValue>()
                 .AddAttribute("tm", a => a.Time, aBuilder =>
                 {
@@ -8683,9 +8683,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.AttributeNameList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonTimeNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TargetElement>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.AttributeNameList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.AttributeNameList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonTimeNode());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TargetElement.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TargetElement());
             builder.AddElement<CommonBehavior>()
                 .AddAttribute("additive", a => a.Additive, aBuilder =>
                 {
@@ -8812,7 +8812,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.FloatVariantValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.FloatVariantValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.FloatVariantValue());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.FloatVariantValue.ElementType, 1, 1)
@@ -9037,11 +9037,11 @@ protected TimeListAnimationVariantType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ColorValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BooleanVariantValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.FloatVariantValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.IntegerVariantValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.StringVariantValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ColorValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ColorValue());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BooleanVariantValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BooleanVariantValue());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.FloatVariantValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.FloatVariantValue());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.IntegerVariantValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.IntegerVariantValue());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.StringVariantValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.StringVariantValue());
         }
 
         /// <summary>
@@ -9205,8 +9205,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonTimeNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TargetElement>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonTimeNode());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TargetElement.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TargetElement());
             builder.AddElement<CommonMediaNode>()
                 .AddAttribute("vol", a => a.Volume, aBuilder =>
                 {
@@ -9306,7 +9306,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ParallelTimeNode>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ParallelTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ParallelTimeNode());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.ParallelTimeNode.ElementType, 1, 1)
@@ -9394,7 +9394,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TimeNodeList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TimeNodeList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TimeNodeList());
             builder.AddElement<Template>()
                 .AddAttribute("lvl", a => a.Level);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -9476,7 +9476,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Template>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Template.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Template());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.Template.ElementType, 0, 9)
@@ -9542,8 +9542,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BuildChart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BuildDiagram>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BuildChart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BuildChart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BuildDiagram.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BuildDiagram());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BuildDiagram.ElementType, 1, 1),
@@ -9725,7 +9725,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TemplateList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TemplateList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TemplateList());
             builder.AddElement<BuildParagraph>()
                 .AddAttribute("spid", a => a.ShapeId, aBuilder =>
                 {
@@ -10058,8 +10058,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BuildSubElement>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BuildAsOne>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BuildSubElement.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BuildSubElement());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BuildAsOne.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BuildAsOne());
             builder.AddElement<BuildGraphics>()
                 .AddAttribute("spid", a => a.ShapeId, aBuilder =>
                 {
@@ -10169,10 +10169,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BuildDiagram>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BuildParagraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BuildGraphics>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BuildOleChart>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BuildDiagram.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BuildDiagram());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BuildParagraph.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BuildParagraph());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BuildGraphics.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BuildGraphics());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BuildOleChart.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BuildOleChart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.BuildParagraph.ElementType, 1, 1),
@@ -10250,7 +10250,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.AddElement<ExtensionListWithModification>()
                 .AddAttribute("mod", a => a.Modify);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -10324,8 +10324,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.RgbColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.RgbColor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.RgbColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.RgbColor.ElementType, 1, 1),
@@ -10569,12 +10569,12 @@ protected Color3Type(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
         }
 
         /// <summary>
@@ -10905,7 +10905,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentAuthorExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommentAuthorExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommentAuthorExtensionList());
             builder.AddElement<CommentAuthor>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -11039,9 +11039,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Position.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommentExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommentExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Text.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Text());
             builder.AddElement<Comment>()
                 .AddAttribute("authorId", a => a.AuthorId, aBuilder =>
                 {
@@ -11157,7 +11157,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Extension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -11292,8 +11292,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Picture>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Picture.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Picture());
             builder.AddElement<Control>()
                 .AddAttribute("spid", a => a.ShapeId, aBuilder =>
                 {
@@ -11424,7 +11424,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<SlideId>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -11537,7 +11537,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<SlideMasterId>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -11639,7 +11639,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<NotesMasterId>()
                 .AddAttribute("r:id", a => a.Id, aBuilder =>
                 {
@@ -11736,7 +11736,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<HandoutMasterId>()
                 .AddAttribute("r:id", a => a.Id, aBuilder =>
                 {
@@ -12066,11 +12066,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Font>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.RegularFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BoldFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ItalicFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BoldItalicFont>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Font.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Font());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.RegularFont.ElementType, static () => new DocumentFormat.OpenXml.Presentation.RegularFont());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BoldFont.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BoldFont());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ItalicFont.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ItalicFont());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BoldItalicFont.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BoldItalicFont());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.Font.ElementType, 1, 1),
@@ -12204,7 +12204,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideListEntry>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideListEntry.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideListEntry());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.SlideListEntry.ElementType, 0, 0)
@@ -12290,8 +12290,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideList());
             builder.AddElement<CustomShow>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -12445,9 +12445,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnClick>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HyperlinkOnHover>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnClick.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnClick());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HyperlinkOnHover.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HyperlinkOnHover());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualDrawingPropertiesExtensionList());
             builder.AddElement<NonVisualDrawingProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -12576,8 +12576,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapeLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapeLocks());
             builder.AddElement<NonVisualShapeDrawingProperties>()
                 .AddAttribute("txBox", a => a.TextBox);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -12698,14 +12698,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AudioFromCD>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.AudioFromFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.WaveAudioFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.QuickTimeFromFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.VideoFromFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomerDataList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PlaceholderShape>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AudioFromCD.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AudioFromCD());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.AudioFromFile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.AudioFromFile());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.WaveAudioFile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.WaveAudioFile());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.QuickTimeFromFile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.QuickTimeFromFile());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.VideoFromFile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.VideoFromFile());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomerDataList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomerDataList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PlaceholderShape.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PlaceholderShape());
             builder.AddElement<ApplicationNonVisualDrawingProperties>()
                 .AddAttribute("isPhoto", a => a.IsPhoto)
                 .AddAttribute("userDrawn", a => a.UserDrawn);
@@ -12801,9 +12801,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualShapeDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualShapeDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -12933,21 +12933,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.CustomGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetGeometry>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Shape3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Transform2D>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.CustomGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.CustomGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetGeometry.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetGeometry());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Shape3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Shape3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ShapePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Transform2D.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Transform2D());
             builder.AddElement<ShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -13065,10 +13065,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FontReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.LineReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.FillReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FontReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FontReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.LineReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.FillReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.FillReference());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectReference.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.LineReference.ElementType, 1, 1),
@@ -13190,9 +13190,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BodyProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ListStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Paragraph>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BodyProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ListStyle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ListStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Paragraph());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.BodyProperties.ElementType, 1, 1),
@@ -13288,10 +13288,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.StartConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EndConnection>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.StartConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.StartConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EndConnection.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EndConnection());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ConnectionShapeLocks.ElementType, 0, 1),
@@ -13413,9 +13413,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualConnectorShapeDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualConnectorShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualConnectorShapeDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -13532,8 +13532,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PictureLocks>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualPicturePropertiesExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PictureLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PictureLocks());
             builder.AddElement<NonVisualPictureDrawingProperties>()
                 .AddAttribute("preferRelativeResize", a => a.PreferRelativeResize);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -13629,9 +13629,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualPictureDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualPictureDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualPictureDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -13760,10 +13760,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Blip>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SourceRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Stretch>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Tile>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Blip.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Blip());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SourceRectangle.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SourceRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Stretch.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Stretch());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Tile.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Tile());
             builder.AddElement<BlipFill>()
                 .AddAttribute("dpi", a => a.Dpi)
                 .AddAttribute("rotWithShape", a => a.RotateWithShape);
@@ -13867,8 +13867,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GraphicFrameLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GraphicFrameLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GraphicFrameLocks.ElementType, 0, 1),
@@ -13962,9 +13962,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualGraphicFrameDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualGraphicFrameDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualGraphicFrameDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -14101,8 +14101,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Offset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Extents>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Offset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Offset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Extents.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Extents());
             builder.AddElement<Transform>()
                 .AddAttribute("rot", a => a.Rotation)
                 .AddAttribute("flipH", a => a.HorizontalFlip)
@@ -14199,8 +14199,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupShapeLocks>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupShapeLocks());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NonVisualGroupDrawingShapePropsExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.GroupShapeLocks.ElementType, 0, 1),
@@ -14721,17 +14721,17 @@ protected TextListStyleType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.DefaultParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level1ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level2ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level3ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level4ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level5ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level6ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level7ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level8ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Level9ParagraphProperties());
         }
 
         /// <summary>
@@ -14955,7 +14955,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<SlideLayoutId>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -15058,11 +15058,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Background>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideDataExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ControlList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomerDataList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShapeTree>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Background.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Background());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideDataExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideDataExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ControlList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ControlList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomerDataList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomerDataList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShapeTree.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShapeTree());
             builder.AddElement<CommonSlideData>()
                 .AddAttribute("name", a => a.Name);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -15372,8 +15372,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ScaleX>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ScaleY>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ScaleX.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ScaleX());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ScaleY.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ScaleY());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.ScaleX.ElementType, 1, 1),
@@ -15593,8 +15593,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Origin>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ScaleFactor>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Origin.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Origin());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ScaleFactor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ScaleFactor());
             builder.AddElement<CommonViewProperties>()
                 .AddAttribute("varScale", a => a.VariableScale);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -15748,7 +15748,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.OutlineViewSlideListEntry>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.OutlineViewSlideListEntry.ElementType, static () => new DocumentFormat.OpenXml.Presentation.OutlineViewSlideListEntry());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.OutlineViewSlideListEntry.ElementType, 0, 0)
@@ -15869,7 +15869,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Guide>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Guide.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Guide());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 0, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.Guide.ElementType, 0, 0)
@@ -15965,8 +15965,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.GuideList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.GuideList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.GuideList());
             builder.AddElement<CommonSlideViewProperties>()
                 .AddAttribute("snapToGrid", a => a.SnapToGrid)
                 .AddAttribute("snapToObjects", a => a.SnapToObjects)
@@ -16114,9 +16114,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.RestoredLeft>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.RestoredTop>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.RestoredLeft.ElementType, static () => new DocumentFormat.OpenXml.Presentation.RestoredLeft());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.RestoredTop.ElementType, static () => new DocumentFormat.OpenXml.Presentation.RestoredTop());
             builder.AddElement<NormalViewProperties>()
                 .AddAttribute("showOutlineIcons", a => a.ShowOutlineIcons)
                 .AddAttribute("snapVertSplitter", a => a.SnapVerticalSplitter)
@@ -16235,8 +16235,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonSlideViewProperties.ElementType, 1, 1),
@@ -16330,9 +16330,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.OutlineViewSlideList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.OutlineViewSlideList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.OutlineViewSlideList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonViewProperties.ElementType, 1, 1),
@@ -16439,8 +16439,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonViewProperties.ElementType, 1, 1),
@@ -16543,8 +16543,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<SorterViewProperties>()
                 .AddAttribute("showFormatting", a => a.ShowFormatting);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -16639,8 +16639,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideViewProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideViewProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideViewProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonSlideViewProperties.ElementType, 1, 1),
@@ -16861,9 +16861,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.LaserTraceList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ShowEventRecordList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentRelationship>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.LaserTraceList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.LaserTraceList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ShowEventRecordList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ShowEventRecordList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentRelationship.ElementType, static () => new DocumentFormat.OpenXml.Office2021.PowerPoint.Comment.CommentRelationship());
             builder.AddElement<SlideExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -16947,7 +16947,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.CreationId>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.CreationId.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.CreationId());
             builder.AddElement<CommonSlideDataExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -17031,9 +17031,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.LaserColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.BrowseMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ShowMediaControls>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.LaserColor.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.LaserColor());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.BrowseMode.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.BrowseMode());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ShowMediaControls.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ShowMediaControls());
             builder.AddElement<ShowPropertiesExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -17111,11 +17111,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualPictureProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualPictureProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualPictureProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NonVisualPictureProperties.ElementType, 1, 1),
@@ -17259,7 +17259,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<OleObjectEmbed>()
                 .AddAttribute("followColorScheme", a => a.FollowColorScheme, aBuilder =>
                 {
@@ -17352,7 +17352,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<OleObjectLink>()
                 .AddAttribute("updateAutomatic", a => a.AutoUpdate);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -17517,49 +17517,49 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.StripsTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CoverTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PullTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CircleTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.DissolveTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.DiamondTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NewsflashTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PlusTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.RandomTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.WedgeTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.FlashTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.HoneycombTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ZoomTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.WarpTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CutTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.FadeTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BlindsTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CheckerTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CombTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.RandomBarTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.DoorsTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.WindowTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PushTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.WipeTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.VortexTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.PanTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SplitTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SoundAction>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.WheelTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.WheelReverseTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.FlythroughTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.GlitterTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SwitchTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.FlipTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.FerrisTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.GalleryTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ConveyorTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.PrismTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.RevealTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.RippleTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ShredTransition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.PresetTransition>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.StripsTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.StripsTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CoverTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CoverTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PullTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PullTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CircleTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CircleTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.DissolveTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.DissolveTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.DiamondTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.DiamondTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NewsflashTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NewsflashTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PlusTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PlusTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.RandomTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.RandomTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.WedgeTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.WedgeTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.FlashTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.FlashTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.HoneycombTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.HoneycombTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ZoomTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ZoomTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.WarpTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.WarpTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CutTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CutTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.FadeTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.FadeTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BlindsTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BlindsTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CheckerTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CheckerTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CombTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CombTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.RandomBarTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.RandomBarTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.DoorsTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.DoorsTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.WindowTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.WindowTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PushTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PushTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.WipeTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.WipeTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.VortexTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.VortexTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.PanTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.PanTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SplitTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SplitTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SoundAction.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SoundAction());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.WheelTransition.ElementType, static () => new DocumentFormat.OpenXml.Presentation.WheelTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.WheelReverseTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.WheelReverseTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.FlythroughTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.FlythroughTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.GlitterTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.GlitterTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SwitchTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SwitchTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.FlipTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.FlipTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.FerrisTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.FerrisTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.GalleryTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.GalleryTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ConveyorTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ConveyorTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.PrismTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.PrismTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.RevealTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.RevealTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.RippleTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.RippleTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ShredTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ShredTransition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.PresetTransition.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.PresetTransition());
             builder.AddElement<Transition>()
                 .AddAttribute("spd", a => a.Speed, aBuilder =>
                 {
@@ -17688,9 +17688,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BuildList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TimeNodeList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BuildList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BuildList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TimeNodeList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TimeNodeList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.TimeNodeList.ElementType, 0, 1),
@@ -17796,7 +17796,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.SlideExtension.ElementType, 0, 0)
@@ -17872,8 +17872,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BackgroundStyleReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BackgroundProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BackgroundStyleReference.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BackgroundStyleReference());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BackgroundProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BackgroundProperties());
             builder.AddElement<Background>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -18149,15 +18149,15 @@ protected GroupShapeType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.GroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ConnectionShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.GraphicFrame>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.GroupShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualGroupShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Shape>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.GroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.GroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ConnectionShape.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ConnectionShape());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.GraphicFrame.ElementType, static () => new DocumentFormat.OpenXml.Presentation.GraphicFrame());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.GroupShape.ElementType, static () => new DocumentFormat.OpenXml.Presentation.GroupShape());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualGroupShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualGroupShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Picture.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Shape.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Shape());
         }
 
         /// <summary>
@@ -18242,8 +18242,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomerData>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomerDataTags>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomerData.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomerData());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomerDataTags.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomerDataTags());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 0, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CustomerData.ElementType, 0, 0),
@@ -18309,7 +18309,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Control>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Control.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Control());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.Control.ElementType, 0, 0)
@@ -18374,7 +18374,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommonSlideDataExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommonSlideDataExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommonSlideDataExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommonSlideDataExtension.ElementType, 0, 0)
@@ -18441,9 +18441,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualGroupShapeDrawingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualGroupShapeDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualGroupShapeDrawingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NonVisualDrawingProperties.ElementType, 1, 1),
@@ -18569,17 +18569,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.BlipFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectDag>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.EffectList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.GroupFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TransformGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.NoFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PatternFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Scene3DType>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SolidFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.BlipFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.BlipFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectDag.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectDag());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.EffectList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.EffectList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.GroupFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.GroupFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.TransformGroup.ElementType, static () => new DocumentFormat.OpenXml.Drawing.TransformGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.NoFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.NoFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Drawing.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PatternFill());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Scene3DType.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Scene3DType());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SolidFill.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SolidFill());
             builder.AddElement<GroupShapeProperties>()
                 .AddAttribute("bwMode", a => a.BlackWhiteMode, aBuilder =>
                 {
@@ -18698,11 +18698,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TextBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualShapeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TextBody.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TextBody());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualShapeProperties());
             builder.AddElement<Shape>()
                 .AddAttribute("useBgFill", a => a.UseBackgroundFill);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -18841,10 +18841,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Graphic>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Transform>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualGraphicFrameProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Graphic.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Graphic());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Transform.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Transform());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualGraphicFrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualGraphicFrameProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NonVisualGraphicFrameProperties.ElementType, 1, 1),
@@ -18967,10 +18967,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShapeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NonVisualConnectionShapeProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShapeStyle.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShapeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NonVisualConnectionShapeProperties.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NonVisualConnectionShapeProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NonVisualConnectionShapeProperties.ElementType, 1, 1),
@@ -19090,7 +19090,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShowPropertiesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShowPropertiesExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShowPropertiesExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.ShowPropertiesExtension.ElementType, 0, 0)
@@ -19169,11 +19169,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.GraphicElement>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BackgroundAnimation>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.OleChartElement>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SubShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TextElement>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.GraphicElement.ElementType, static () => new DocumentFormat.OpenXml.Presentation.GraphicElement());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BackgroundAnimation.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BackgroundAnimation());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.OleChartElement.ElementType, static () => new DocumentFormat.OpenXml.Presentation.OleChartElement());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SubShape.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SubShape());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TextElement.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TextElement());
             builder.AddElement<ShapeTarget>()
                 .AddAttribute("spid", a => a.ShapeId, aBuilder =>
                 {
@@ -19427,7 +19427,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.PresenceInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.PresenceInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.PresenceInfo());
             builder.AddElement<CommentAuthorExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -19509,7 +19509,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ThreadingInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ThreadingInfo.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ThreadingInfo());
             builder.AddElement<CommentExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -19591,7 +19591,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList());
             builder.AddElement<SlideLayoutExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -19673,7 +19673,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList());
             builder.AddElement<SlideMasterExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -19755,7 +19755,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList());
             builder.AddElement<HandoutMasterExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -19837,7 +19837,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList());
             builder.AddElement<NotesMasterExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -19959,7 +19959,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
             builder.AddElement<PlaceholderShape>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -20052,7 +20052,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.ApplicationNonVisualDrawingPropertiesExtension.ElementType, 0, 0)
@@ -20128,8 +20128,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.Media>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.ModificationId>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.Media.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.Media());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.ModificationId.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.ModificationId());
             builder.AddElement<ApplicationNonVisualDrawingPropertiesExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -20223,8 +20223,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TimePercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TimeAbsolute>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TimePercentage.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TimePercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TimeAbsolute.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TimeAbsolute());
             builder.AddElement<Iterate>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -20509,19 +20509,19 @@ protected TimeTypeListType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Animate>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.AnimateColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.AnimateEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.AnimateMotion>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.AnimateRotation>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.AnimateScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Command>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Audio>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.Video>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SetBehavior>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExclusiveTimeNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ParallelTimeNode>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SequenceTimeNode>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Animate.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Animate());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.AnimateColor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.AnimateColor());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.AnimateEffect.ElementType, static () => new DocumentFormat.OpenXml.Presentation.AnimateEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.AnimateMotion.ElementType, static () => new DocumentFormat.OpenXml.Presentation.AnimateMotion());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.AnimateRotation.ElementType, static () => new DocumentFormat.OpenXml.Presentation.AnimateRotation());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.AnimateScale.ElementType, static () => new DocumentFormat.OpenXml.Presentation.AnimateScale());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Command.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Command());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Audio.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Audio());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.Video.ElementType, static () => new DocumentFormat.OpenXml.Presentation.Video());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SetBehavior.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SetBehavior());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExclusiveTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExclusiveTimeNode());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ParallelTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ParallelTimeNode());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SequenceTimeNode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SequenceTimeNode());
         }
     }
 
@@ -20579,7 +20579,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TimeAnimateValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TimeAnimateValue.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TimeAnimateValue());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.TimeAnimateValue.ElementType, 0, 0)
@@ -20819,7 +20819,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentAuthorExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommentAuthorExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommentAuthorExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommentAuthorExtension.ElementType, 0, 0)
@@ -20884,7 +20884,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CommentExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CommentExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CommentExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CommentExtension.ElementType, 0, 0)
@@ -20949,7 +20949,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideMasterId>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideMasterId.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideMasterId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.SlideMasterId.ElementType, 0, 0)
@@ -21014,7 +21014,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesMasterId>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesMasterId.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesMasterId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NotesMasterId.ElementType, 0, 1)
@@ -21092,7 +21092,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HandoutMasterId>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HandoutMasterId.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HandoutMasterId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.HandoutMasterId.ElementType, 0, 1)
@@ -21170,7 +21170,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideId>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideId.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.SlideId.ElementType, 0, 0)
@@ -21310,7 +21310,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.EmbeddedFont>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.EmbeddedFont.ElementType, static () => new DocumentFormat.OpenXml.Presentation.EmbeddedFont());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.EmbeddedFont.ElementType, 0, 0)
@@ -21375,7 +21375,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomShow>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomShow.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomShow());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CustomShow.ElementType, 0, 0)
@@ -21480,7 +21480,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<PhotoAlbum>()
                 .AddAttribute("bw", a => a.BlackWhite)
                 .AddAttribute("showCaptions", a => a.ShowCaptions)
@@ -21890,7 +21890,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PresentationExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PresentationExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PresentationExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.PresentationExtension.ElementType, 0, 0)
@@ -21968,10 +21968,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SectionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.SectionProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.NotesGuideList>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SectionList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.SectionProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.SectionProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.SlideGuideList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.NotesGuideList.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.NotesGuideList());
             builder.AddElement<PresentationExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -22082,10 +22082,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomShowReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideAll>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideRange>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomShowReference.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomShowReference());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideAll.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideAll());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideRange.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideRange());
             builder.AddElement<HtmlPublishProperties>()
                 .AddAttribute("showSpeakerNotes", a => a.ShowSpeakerNotes)
                 .AddAttribute("pubBrowser", a => a.TargetBrowser, aBuilder =>
@@ -22259,7 +22259,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<WebProperties>()
                 .AddAttribute("showAnimation", a => a.ShowAnimation)
                 .AddAttribute("resizeGraphics", a => a.ResizeGraphics)
@@ -22403,7 +22403,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.AddElement<PrintingProperties>()
                 .AddAttribute("prnWhat", a => a.PrintWhat, aBuilder =>
                 {
@@ -22540,14 +22540,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PenColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CustomShowReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PresenterSlideMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideAll>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BrowseSlideMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.KioskSlideMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ShowPropertiesExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PenColor.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PenColor());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CustomShowReference.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CustomShowReference());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PresenterSlideMode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PresenterSlideMode());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideAll.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideAll());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideRange.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideRange());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BrowseSlideMode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BrowseSlideMode());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.KioskSlideMode.ElementType, static () => new DocumentFormat.OpenXml.Presentation.KioskSlideMode());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ShowPropertiesExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ShowPropertiesExtensionList());
             builder.AddElement<ShowProperties>()
                 .AddAttribute("loop", a => a.Loop)
                 .AddAttribute("showNarration", a => a.ShowNarration)
@@ -22641,12 +22641,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.HslColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.PresetColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SchemeColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.RgbColorModelHex>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.SystemColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.HslColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.HslColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.PresetColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.PresetColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SchemeColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SchemeColor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelPercentage());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.RgbColorModelHex.ElementType, static () => new DocumentFormat.OpenXml.Drawing.RgbColorModelHex());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.SystemColor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.SystemColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1, requireFilter: true)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 10, version: FileFormatVersions.Office2007)
@@ -22734,7 +22734,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.PresentationPropertiesExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.PresentationPropertiesExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.PresentationPropertiesExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.PresentationPropertiesExtension.ElementType, 0, 0)
@@ -22812,10 +22812,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Drawing.TextMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.DefaultImageDpi>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.PowerPoint.DiscardImageEditData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.PowerPoint.ChartTrackingReferenceBased>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Drawing.TextMath.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Drawing.TextMath());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.DefaultImageDpi.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.DefaultImageDpi());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.PowerPoint.DiscardImageEditData.ElementType, static () => new DocumentFormat.OpenXml.Office2010.PowerPoint.DiscardImageEditData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.PowerPoint.ChartTrackingReferenceBased.ElementType, static () => new DocumentFormat.OpenXml.Office2013.PowerPoint.ChartTrackingReferenceBased());
             builder.AddElement<PresentationPropertiesExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -22930,7 +22930,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionListWithModification>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionListWithModification.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionListWithModification());
             builder.AddElement<HeaderFooter>()
                 .AddAttribute("sldNum", a => a.SlideNumber)
                 .AddAttribute("hdr", a => a.Header)
@@ -23013,7 +23013,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideLayoutExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideLayoutExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideLayoutExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.SlideLayoutExtension.ElementType, 0, 0)
@@ -23078,7 +23078,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideLayoutId>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideLayoutId.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideLayoutId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.SlideLayoutId.ElementType, 0, 0)
@@ -23146,10 +23146,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.TitleStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.BodyStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.OtherStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.TitleStyle.ElementType, static () => new DocumentFormat.OpenXml.Presentation.TitleStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.BodyStyle.ElementType, static () => new DocumentFormat.OpenXml.Presentation.BodyStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.OtherStyle.ElementType, static () => new DocumentFormat.OpenXml.Presentation.OtherStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.TitleStyle.ElementType, 0, 1),
@@ -23269,7 +23269,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.SlideMasterExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.SlideMasterExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.SlideMasterExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.SlideMasterExtension.ElementType, 0, 0)
@@ -23334,7 +23334,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.HandoutMasterExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.HandoutMasterExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.HandoutMasterExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.HandoutMasterExtension.ElementType, 0, 0)
@@ -23399,7 +23399,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.NotesMasterExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.NotesMasterExtension.ElementType, static () => new DocumentFormat.OpenXml.Presentation.NotesMasterExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.NotesMasterExtension.ElementType, 0, 0)
@@ -23522,8 +23522,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.CharRange>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.ParagraphIndexRange>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.CharRange.ElementType, static () => new DocumentFormat.OpenXml.Presentation.CharRange());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.ParagraphIndexRange.ElementType, static () => new DocumentFormat.OpenXml.Presentation.ParagraphIndexRange());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.CharRange.ElementType, 1, 1),
@@ -23616,8 +23616,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Chart>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Diagram>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Chart.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Chart());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Diagram.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Diagram());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Diagram.ElementType, 1, 1),
@@ -24366,8 +24366,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.EndSoundAction>();
-            builder.AddChild<DocumentFormat.OpenXml.Presentation.StartSoundAction>();
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.EndSoundAction.ElementType, static () => new DocumentFormat.OpenXml.Presentation.EndSoundAction());
+            builder.AddChild(DocumentFormat.OpenXml.Presentation.StartSoundAction.ElementType, static () => new DocumentFormat.OpenXml.Presentation.StartSoundAction());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Presentation.StartSoundAction.ElementType, 1, 1),
@@ -24460,7 +24460,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Microsoft365;
-            builder.AddChild<DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeExtension.ElementType, static () => new DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Office.PowerPoint.Y2023.M02.Main.PlaceholderTypeExtension.ElementType, 0, 1, version: FileFormatVersions.Microsoft365)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_schemaLibrary_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_schemaLibrary_2006_main.g.cs
index bfc7da0ac..60b2a5df6 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_schemaLibrary_2006_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_schemaLibrary_2006_main.g.cs
@@ -71,7 +71,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.CustomXmlSchemaReferences.Schema>();
+            builder.AddChild(DocumentFormat.OpenXml.CustomXmlSchemaReferences.Schema.ElementType, static () => new DocumentFormat.OpenXml.CustomXmlSchemaReferences.Schema());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.CustomXmlSchemaReferences.Schema.ElementType, 0, 0)
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs
index 9e04bff46..6b431d3d3 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_spreadsheetml_2006_main.g.cs
@@ -158,8 +158,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculationCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculationCell.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculationCell());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CalculationCell.ElementType, 1, 0),
@@ -258,9 +258,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Authors>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CommentList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Authors.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Authors());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CommentList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CommentList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Authors.ElementType, 1, 1),
@@ -408,8 +408,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Map>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Schema>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Map.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Map());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Schema.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Schema());
             builder.AddElement<MapInfo>()
                 .AddAttribute("SelectionNamespaces", a => a.SelectionNamespaces, aBuilder =>
                 {
@@ -511,7 +511,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Connection>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Connection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Connection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Connection.ElementType, 1, 0)
@@ -810,17 +810,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheHierarchies>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheSource>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculatedItems>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculatedMembers>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Dimensions>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Maps>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MeasureGroups>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Kpis>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotCacheDefinitionExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TupleCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheHierarchies.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheHierarchies());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheSource.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheSource());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculatedItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculatedItems());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculatedMembers.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculatedMembers());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Dimensions.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Dimensions());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Maps.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Maps());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MeasureGroups.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MeasureGroups());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Kpis.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Kpis());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotCacheDefinitionExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotCacheDefinitionExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TupleCache.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TupleCache());
             builder.AddElement<PivotCacheDefinition>()
                 .AddAttribute("r:id", a => a.Id)
                 .AddAttribute("invalid", a => a.Invalid)
@@ -1101,8 +1101,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotCacheRecord>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotCacheRecord.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotCacheRecord());
             builder.AddElement<PivotCacheRecords>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1897,23 +1897,23 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchiesUsage>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnItems>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Formats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Location>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFilters>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotHierarchies>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotTableStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowHierarchiesUsage>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchiesUsage.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchiesUsage());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnItems());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Formats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Formats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Location.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Location());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFilters.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFilters());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotHierarchies.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotHierarchies());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotTableStyle.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotTableStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowHierarchiesUsage.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowHierarchiesUsage());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowItems());
             builder.AddElement<PivotTableDefinition>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -2558,8 +2558,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.QueryTableExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.QueryTableRefresh>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.QueryTableExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.QueryTableExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.QueryTableRefresh.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.QueryTableRefresh());
             builder.AddElement<QueryTable>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -2736,8 +2736,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SharedStringItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SharedStringItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SharedStringItem());
             builder.AddElement<SharedStringTable>()
                 .AddAttribute("count", a => a.Count)
                 .AddAttribute("uniqueCount", a => a.UniqueCount);
@@ -2959,7 +2959,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Header>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Header.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Header());
             builder.AddElement<Headers>()
                 .AddAttribute("guid", a => a.Guid, aBuilder =>
                 {
@@ -3090,18 +3090,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionAutoFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionComment>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionConflict>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionCustomView>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionDefinedName>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionInsertSheet>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionMove>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionQueryTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionRowColumn>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionSheetName>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionAutoFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionAutoFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionComment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionComment());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionConflict.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionConflict());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionCustomView.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionCustomView());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionDefinedName.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionDefinedName());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionInsertSheet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionInsertSheet());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionMove.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionMove());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionQueryTable.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionQueryTable());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionRowColumn.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionRowColumn());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionSheetName.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionSheetName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.RevisionRowColumn.ElementType, 0, 0),
@@ -3218,7 +3218,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.UserInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.UserInfo.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.UserInfo());
             builder.AddElement<Users>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -3354,44 +3354,44 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.AutoFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellWatches>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Columns>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatting>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Controls>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataConsolidate>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataValidations>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Hyperlinks>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.IgnoredErrors>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MergeCells>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OleObjects>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowBreaks>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageMargins>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageSetup>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PrintOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ProtectedRanges>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Scenarios>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetCalculationProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetData>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetDimension>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortState>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableParts>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WebPublishItems>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WorksheetExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.AutoFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.AutoFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellWatches.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellWatches());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Columns.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Columns());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatting.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatting());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Controls.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Controls());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataConsolidate.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataConsolidate());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataValidations.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataValidations());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Hyperlinks.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Hyperlinks());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.IgnoredErrors.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.IgnoredErrors());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MergeCells.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MergeCells());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OleObjects.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OleObjects());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowBreaks.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowBreaks());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageMargins.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageMargins());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageSetup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageSetup());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PrintOptions.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PrintOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ProtectedRanges.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ProtectedRanges());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Scenarios.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Scenarios());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Picture.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetCalculationProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetCalculationProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetData.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetData());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetDimension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetDimension());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetProtection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortState.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortState());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableParts.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableParts());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WebPublishItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WebPublishItems());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WorksheetExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WorksheetExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.SheetProperties.ElementType, 0, 1),
@@ -3589,20 +3589,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartSheetProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartSheetProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartSheetViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartSheetPageSetup>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomChartsheetViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageMargins>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WebPublishItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartSheetProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartSheetProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartSheetProtection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartSheetProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartSheetViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartSheetViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartSheetPageSetup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartSheetPageSetup());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomChartsheetViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomChartsheetViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageMargins.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageMargins());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Picture.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WebPublishItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WebPublishItems());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ChartSheetProperties.ElementType, 0, 1),
@@ -3908,22 +3908,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Controls>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OleObjects>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageMargins>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageSetup>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PrintOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetViews>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Controls.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Controls());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomSheetViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DrawingHeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LegacyDrawing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LegacyDrawingHeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OleObjects.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OleObjects());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageMargins.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageMargins());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageSetup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageSetup());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PrintOptions.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PrintOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetFormatProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetProtection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetViews());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.SheetProperties.ElementType, 0, 1),
@@ -4248,13 +4248,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FutureMetadata>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MdxMetadata>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellMetadata>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ValueMetadata>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MetadataStrings>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MetadataTypes>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FutureMetadata.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FutureMetadata());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MdxMetadata.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MdxMetadata());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellMetadata.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellMetadata());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ValueMetadata.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ValueMetadata());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MetadataStrings.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MetadataStrings());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MetadataTypes.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MetadataTypes());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.MetadataTypes.ElementType, 0, 1),
@@ -4395,7 +4395,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SingleXmlCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SingleXmlCell.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SingleXmlCell());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.SingleXmlCell.ElementType, 1, 0)
@@ -4501,17 +4501,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Borders>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellStyles>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellStyleFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Colors>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DifferentialFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Fills>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Fonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberingFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.StylesheetExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableStyles>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Borders.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Borders());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellStyles.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellStyles());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellStyleFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellStyleFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Colors.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Colors());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DifferentialFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DifferentialFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Fills.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Fills());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Fonts.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Fonts());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberingFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberingFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.StylesheetExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.StylesheetExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableStyles.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableStyles());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.NumberingFormats.ElementType, 0, 1),
@@ -4763,10 +4763,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DdeLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExternalBook>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OleLink>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DdeLink.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DdeLink());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExternalBook.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExternalBook());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OleLink.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OleLink());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -5092,11 +5092,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.AutoFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortState>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableColumns>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableStyleInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.AutoFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.AutoFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortState.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortState());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableColumns.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableColumns());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableStyleInfo.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableStyleInfo());
             builder.AddElement<Table>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -5309,8 +5309,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.VolatileType>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.VolatileType.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.VolatileType());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.VolatileType.ElementType, 1, 0),
@@ -5434,24 +5434,24 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.BookViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculationProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomWorkbookViews>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DefinedNames>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExternalReferences>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FileRecoveryProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FileSharing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FileVersion>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FunctionGroups>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OleSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotCaches>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Sheets>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WebPublishing>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WebPublishObjects>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WorkbookExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WorkbookProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WorkbookProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.ExcelAc.AbsolutePath>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.BookViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.BookViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculationProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculationProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomWorkbookViews.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomWorkbookViews());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DefinedNames.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DefinedNames());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExternalReferences.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExternalReferences());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FileRecoveryProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FileRecoveryProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FileSharing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FileSharing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FileVersion.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FileVersion());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FunctionGroups.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FunctionGroups());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OleSize.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OleSize());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotCaches.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotCaches());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Sheets.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Sheets());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WebPublishing.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WebPublishing());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WebPublishObjects.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WebPublishObjects());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WorkbookExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WorkbookExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WorkbookProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WorkbookProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WorkbookProtection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WorkbookProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.ExcelAc.AbsolutePath.ElementType, static () => new DocumentFormat.OpenXml.Office2013.ExcelAc.AbsolutePath());
             builder.AddElement<Workbook>()
                 .AddAttribute("conformance", a => a.Conformance);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -5799,15 +5799,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColorFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomFilters>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DynamicFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Filters>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.IconFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Top10>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.CustomFilters>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.IconFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColorFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColorFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomFilters.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomFilters());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DynamicFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DynamicFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Filters.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Filters());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.IconFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.IconFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Top10.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Top10());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.CustomFilters.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.CustomFilters());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.IconFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.IconFilter());
             builder.AddElement<FilterColumn>()
                 .AddAttribute("colId", a => a.ColumnId, aBuilder =>
                 {
@@ -6046,9 +6046,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortCondition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SortCondition>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortCondition.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortCondition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SortCondition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SortCondition());
             builder.AddElement<SortState>()
                 .AddAttribute("columnSort", a => a.ColumnSort)
                 .AddAttribute("caseSensitive", a => a.CaseSensitive)
@@ -6126,7 +6126,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -6359,7 +6359,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Author>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Author.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Author());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Author.ElementType, 0, 0)
@@ -6424,7 +6424,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Comment>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Comment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Comment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Comment.ElementType, 0, 0)
@@ -6530,8 +6530,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CommentProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CommentText>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CommentProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CommentProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CommentText.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CommentText());
             builder.AddElement<Comment>()
                 .AddAttribute("ref", a => a.Reference, aBuilder =>
                 {
@@ -7534,7 +7534,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataBinding>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataBinding.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataBinding());
             builder.AddElement<Map>()
                 .AddAttribute("ID", a => a.ID, aBuilder =>
                 {
@@ -7984,12 +7984,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConnectionExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DatabaseProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OlapProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Parameters>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TextProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WebQueryProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConnectionExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConnectionExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DatabaseProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DatabaseProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OlapProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OlapProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Parameters.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Parameters());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TextProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TextProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WebQueryProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WebQueryProperties());
             builder.AddElement<Connection>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -8185,9 +8185,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FieldItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MissingTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CharacterValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FieldItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FieldItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MissingTable.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MissingTable());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CharacterValue.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CharacterValue());
             builder.AddElement<Tables>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
@@ -8713,10 +8713,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheFieldExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FieldGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SharedItems>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberPropertiesMap>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheFieldExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheFieldExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FieldGroup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FieldGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SharedItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SharedItems());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberPropertiesMap.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberPropertiesMap());
             builder.AddElement<CacheField>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -8838,7 +8838,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Page>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Page.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Page());
             builder.AddElement<Pages>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -8915,7 +8915,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RangeSet>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RangeSet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RangeSet());
             builder.AddElement<RangeSets>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -8992,7 +8992,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageItem());
             builder.AddElement<Page>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -9339,8 +9339,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Tuples>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Tuples.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Tuples());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex());
             builder.AddElement<MissingItem>()
                 .AddAttribute("u", a => a.Unused)
                 .AddAttribute("f", a => a.Calculated)
@@ -9547,8 +9547,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Tuples>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Tuples.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Tuples());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex());
             builder.AddElement<NumberItem>()
                 .AddAttribute("v", a => a.Val, aBuilder =>
                 {
@@ -9691,7 +9691,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex());
             builder.AddElement<BooleanItem>()
                 .AddAttribute("v", a => a.Val, aBuilder =>
                 {
@@ -9887,8 +9887,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Tuples>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Tuples.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Tuples());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex());
             builder.AddElement<ErrorItem>()
                 .AddAttribute("v", a => a.Val, aBuilder =>
                 {
@@ -10112,8 +10112,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Tuples>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Tuples.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Tuples());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex());
             builder.AddElement<StringItem>()
                 .AddAttribute("v", a => a.Val, aBuilder =>
                 {
@@ -10253,7 +10253,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex());
             builder.AddElement<DateTimeItem>()
                 .AddAttribute("v", a => a.Val, aBuilder =>
                 {
@@ -10465,7 +10465,7 @@ public UInt32Value? MemberNameCount
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Tuple>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Tuple.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Tuple());
             builder.AddElement<TuplesType>()
                 .AddAttribute("c", a => a.MemberNameCount);
         }
@@ -10630,13 +10630,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.BooleanItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DateTimeItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ErrorItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FieldItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MissingItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.StringItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.BooleanItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.BooleanItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DateTimeItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DateTimeItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ErrorItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ErrorItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FieldItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FieldItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MissingItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MissingItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.StringItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.StringItem());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.MissingItem.ElementType, 1, 1),
@@ -10955,8 +10955,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Groups>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Groups.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Groups());
             builder.AddElement<GroupLevel>()
                 .AddAttribute("uniqueName", a => a.UniqueName, aBuilder =>
                 {
@@ -11070,7 +11070,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Group>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Group.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Group());
             builder.AddElement<Groups>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -11187,7 +11187,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.GroupMembers>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.GroupMembers.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.GroupMembers());
             builder.AddElement<Group>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -11294,7 +11294,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.GroupMember>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.GroupMember.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.GroupMember());
             builder.AddElement<GroupMembers>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -11432,10 +11432,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ErrorItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MissingItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.StringItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ErrorItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ErrorItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MissingItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MissingItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.StringItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.StringItem());
             builder.AddElement<Entries>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
@@ -11515,7 +11515,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TupleSet>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TupleSet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TupleSet());
             builder.AddElement<Sets>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -11592,7 +11592,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Query>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Query.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Query());
             builder.AddElement<QueryCache>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -11669,7 +11669,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ServerFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ServerFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ServerFormat());
             builder.AddElement<ServerFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -11913,8 +11913,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Tuples>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortByTuple>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Tuples.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Tuples());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortByTuple.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortByTuple());
             builder.AddElement<TupleSet>()
                 .AddAttribute("count", a => a.Count)
                 .AddAttribute("maxRank", a => a.MaxRank, aBuilder =>
@@ -12004,7 +12004,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Tuples>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Tuples.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Tuples());
             builder.AddElement<Query>()
                 .AddAttribute("mdx", a => a.Mdx, aBuilder =>
                 {
@@ -12109,8 +12109,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotArea>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotArea.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotArea());
             builder.AddElement<CalculatedItem>()
                 .AddAttribute("field", a => a.Field)
                 .AddAttribute("formula", a => a.Formula);
@@ -12326,8 +12326,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotAreaReferences>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotAreaReferences.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotAreaReferences());
             builder.AddElement<PivotArea>()
                 .AddAttribute("field", a => a.Field)
                 .AddAttribute("type", a => a.Type)
@@ -12503,7 +12503,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculatedMemberExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculatedMemberExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculatedMemberExtensionList());
             builder.AddElement<CalculatedMember>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -13086,9 +13086,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.AutoSortScope>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Items>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFieldExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.AutoSortScope.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.AutoSortScope());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Items.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Items());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFieldExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFieldExtensionList());
             builder.AddElement<PivotField>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("axis", a => a.Axis)
@@ -13469,7 +13469,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataFieldExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataFieldExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataFieldExtensionList());
             builder.AddElement<DataField>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("fld", a => a.Field, aBuilder =>
@@ -13589,7 +13589,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberPropertyIndex());
             builder.AddElement<RowItem>()
                 .AddAttribute("t", a => a.ItemType)
                 .AddAttribute("r", a => a.RepeatedItemCount)
@@ -13726,8 +13726,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotArea>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotArea.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotArea());
             builder.AddElement<Format>()
                 .AddAttribute("action", a => a.Action)
                 .AddAttribute("dxfId", a => a.FormatId);
@@ -13854,8 +13854,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotAreas>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotAreas.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotAreas());
             builder.AddElement<ConditionalFormat>()
                 .AddAttribute("scope", a => a.Scope)
                 .AddAttribute("type", a => a.Type)
@@ -13965,7 +13965,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotArea>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotArea.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotArea());
             builder.AddElement<PivotAreas>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -14062,7 +14062,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotArea>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotArea.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotArea());
             builder.AddElement<ChartFormat>()
                 .AddAttribute("chart", a => a.Chart, aBuilder =>
                 {
@@ -14262,9 +14262,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Members>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotHierarchyExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Members.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Members());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotHierarchyExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotHierarchyExtensionList());
             builder.AddElement<PivotHierarchy>()
                 .AddAttribute("outline", a => a.Outline)
                 .AddAttribute("multipleItemSelectionAllowed", a => a.MultipleItemSelectionAllowed)
@@ -14956,8 +14956,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.AutoFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFilterExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.AutoFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.AutoFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFilterExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFilterExtensionList());
             builder.AddElement<PivotFilter>()
                 .AddAttribute("fld", a => a.Field, aBuilder =>
                 {
@@ -15296,9 +15296,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheHierarchyExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FieldsUsage>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.GroupLevels>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheHierarchyExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheHierarchyExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FieldsUsage.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FieldsUsage());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.GroupLevels.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.GroupLevels());
             builder.AddElement<CacheHierarchy>()
                 .AddAttribute("uniqueName", a => a.UniqueName, aBuilder =>
                 {
@@ -15569,7 +15569,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FieldItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FieldItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FieldItem());
             builder.AddElement<DiscreteProperties>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -15651,12 +15651,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.BooleanItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DateTimeItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ErrorItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MissingItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.StringItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.BooleanItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.BooleanItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DateTimeItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DateTimeItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ErrorItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ErrorItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MissingItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MissingItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.StringItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.StringItem());
             builder.AddElement<GroupItems>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
@@ -15778,7 +15778,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<PageField>()
                 .AddAttribute("fld", a => a.Field, aBuilder =>
                 {
@@ -15877,7 +15877,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotAreaReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotAreaReference.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotAreaReference());
             builder.AddElement<PivotAreaReferences>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -16115,8 +16115,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FieldItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FieldItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FieldItem());
             builder.AddElement<PivotAreaReference>()
                 .AddAttribute("field", a => a.Field)
                 .AddAttribute("count", a => a.Count)
@@ -16210,7 +16210,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.QueryTableField>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.QueryTableField.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.QueryTableField());
             builder.AddElement<QueryTableFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -16287,7 +16287,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DeletedField>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DeletedField.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DeletedField());
             builder.AddElement<QueryTableDeletedFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -16470,7 +16470,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<QueryTableField>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -16777,10 +16777,10 @@ protected RstType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PhoneticRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PhoneticProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PhoneticRun.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PhoneticRun());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Run.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Text.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Text());
         }
 
         /// <summary>
@@ -17654,21 +17654,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Condense>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extend>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RunFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FontScheme>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FontFamily>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RunPropertyCharSet>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.VerticalTextAlignment>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Bold.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Italic.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Strike.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Condense.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Condense());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extend.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extend());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Outline.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Color.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RunFont.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RunFont());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FontScheme.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FontScheme());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FontFamily.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FontFamily());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RunPropertyCharSet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RunPropertyCharSet());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Underline.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.VerticalTextAlignment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Bold.ElementType, 0, 1),
@@ -17748,8 +17748,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Text.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Text());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.RunProperties.ElementType, 0, 1),
@@ -17861,7 +17861,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Text>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Text.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Text());
             builder.AddElement<PhoneticRun>()
                 .AddAttribute("sb", a => a.BaseTextStartIndex, aBuilder =>
                 {
@@ -18092,9 +18092,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ReviewedList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetIdMap>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ReviewedList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ReviewedList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetIdMap.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetIdMap());
             builder.AddElement<Header>()
                 .AddAttribute("guid", a => a.Guid, aBuilder =>
                 {
@@ -18309,9 +18309,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Undo>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Undo.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Undo());
             builder.AddElement<RevisionRowColumn>()
                 .AddAttribute("rId", a => a.RevisionId, aBuilder =>
                 {
@@ -18472,9 +18472,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RevisionFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Undo>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionCellChange());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RevisionFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RevisionFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Undo.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Undo());
             builder.AddElement<RevisionMove>()
                 .AddAttribute("rId", a => a.RevisionId, aBuilder =>
                 {
@@ -18683,7 +18683,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<RevisionSheetName>()
                 .AddAttribute("rId", a => a.RevisionId, aBuilder =>
                 {
@@ -19036,11 +19036,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OldCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OldDifferentialFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NewDifferentialFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NewCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OldCell.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OldCell());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OldDifferentialFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OldDifferentialFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NewDifferentialFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NewDifferentialFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NewCell.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NewCell());
             builder.AddElement<RevisionCellChange>()
                 .AddAttribute("rId", a => a.RevisionId, aBuilder =>
                 {
@@ -19257,8 +19257,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<RevisionFormat>()
                 .AddAttribute("sheetId", a => a.SheetId, aBuilder =>
                 {
@@ -19744,9 +19744,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Formula>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OldFormula>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Formula.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Formula());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OldFormula.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OldFormula());
             builder.AddElement<RevisionDefinedName>()
                 .AddAttribute("rId", a => a.RevisionId, aBuilder =>
                 {
@@ -20226,7 +20226,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetId>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetId.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetId());
             builder.AddElement<SheetIdMap>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -20303,7 +20303,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Reviewed>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Reviewed.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Reviewed());
             builder.AddElement<ReviewedList>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -20795,10 +20795,10 @@ public BooleanValue? ShowPhonetic
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.InlineString>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellFormula.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.InlineString.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.InlineString());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellValue.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellValue());
             builder.AddElement<CellType>()
                 .AddAttribute("r", a => a.CellReference)
                 .AddAttribute("s", a => a.StyleIndex)
@@ -20978,10 +20978,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.InlineString>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellFormula.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.InlineString.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.InlineString());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellValue.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellValue());
             builder.AddElement<NewCell>()
                 .AddAttribute("r", a => a.CellReference, aBuilder =>
                 {
@@ -21347,13 +21347,13 @@ protected DifferentialFormatType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Alignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Protection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Fill>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Font>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Border.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Alignment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Alignment());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Protection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Protection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Fill.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Fill());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Font());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberingFormat());
         }
 
         /// <summary>
@@ -21780,7 +21780,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<UserInfo>()
                 .AddAttribute("guid", a => a.Guid, aBuilder =>
                 {
@@ -22010,8 +22010,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Cell>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Cell.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Cell());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<Row>()
                 .AddAttribute("r", a => a.RowIndex)
                 .AddAttribute("spans", a => a.Spans)
@@ -22715,7 +22715,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotArea>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotArea.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotArea());
             builder.AddElement<PivotSelection>()
                 .AddAttribute("pane", a => a.Pane)
                 .AddAttribute("showHeader", a => a.ShowHeader)
@@ -23135,7 +23135,7 @@ public UInt32Value? ManualBreakCount
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Break>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Break.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Break());
             builder.AddElement<PageBreakType>()
                 .AddAttribute("count", a => a.Count)
                 .AddAttribute("manualBreakCount", a => a.ManualBreakCount);
@@ -23674,12 +23674,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OddHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OddFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.EvenHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.EvenFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FirstHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FirstFooter>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OddHeader.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OddHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OddFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OddFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.EvenHeader.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.EvenHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.EvenFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.EvenFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FirstHeader.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FirstHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FirstFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FirstFooter());
             builder.AddElement<HeaderFooter>()
                 .AddAttribute("differentOddEven", a => a.DifferentOddEven)
                 .AddAttribute("differentFirst", a => a.DifferentFirst)
@@ -23844,9 +23844,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FilterColumn>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortState>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FilterColumn.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FilterColumn());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortState.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortState());
             builder.AddElement<AutoFilter>()
                 .AddAttribute("ref", a => a.Reference);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -24049,11 +24049,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRuleExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColorScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataBar>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.IconSet>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Formula>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRuleExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRuleExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColorScale.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColorScale());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataBar.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataBar());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.IconSet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.IconSet());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Formula.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Formula());
             builder.AddElement<ConditionalFormattingRule>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -24271,7 +24271,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<ConditionalFormatValueObject>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -24416,7 +24416,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.InputCells>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.InputCells.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.InputCells());
             builder.AddElement<Scenario>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -25122,7 +25122,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<ChartSheetView>()
                 .AddAttribute("tabSelected", a => a.TabSelected)
                 .AddAttribute("zoomScale", a => a.ZoomScale)
@@ -25256,9 +25256,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartSheetPageSetup>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageMargins>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartSheetPageSetup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartSheetPageSetup());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageMargins.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageMargins());
             builder.AddElement<CustomChartsheetView>()
                 .AddAttribute("guid", a => a.Guid, aBuilder =>
                 {
@@ -25502,7 +25502,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ControlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ControlProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ControlProperties());
             builder.AddElement<Control>()
                 .AddAttribute("shapeId", a => a.ShapeId, aBuilder =>
                 {
@@ -25915,9 +25915,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Formula1>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Formula2>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.ExcelAc.List>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Formula1.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Formula1());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Formula2.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Formula2());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.ExcelAc.List.ElementType, static () => new DocumentFormat.OpenXml.Office2010.ExcelAc.List());
             builder.AddElement<DataValidation>()
                 .AddAttribute("type", a => a.Type)
                 .AddAttribute("errorStyle", a => a.ErrorStyle)
@@ -26236,10 +26236,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Pane>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotSelection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Selection>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Pane.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Pane());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotSelection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotSelection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Selection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Selection());
             builder.AddElement<SheetView>()
                 .AddAttribute("windowProtection", a => a.WindowProtection)
                 .AddAttribute("showFormulas", a => a.ShowFormulas)
@@ -26558,16 +26558,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.AutoFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.HeaderFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowBreaks>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageMargins>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageSetup>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Pane>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PrintOptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Selection>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.AutoFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.AutoFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.HeaderFooter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.HeaderFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowBreaks.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowBreaks());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnBreaks());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageMargins.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageMargins());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageSetup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageSetup());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Pane.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Pane());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PrintOptions.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PrintOptions());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Selection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Selection());
             builder.AddElement<CustomSheetView>()
                 .AddAttribute("guid", a => a.Guid, aBuilder =>
                 {
@@ -26872,7 +26872,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.EmbeddedObjectProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.EmbeddedObjectProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.EmbeddedObjectProperties());
             builder.AddElement<OleObject>()
                 .AddAttribute("progId", a => a.ProgId)
                 .AddAttribute("dvAspect", a => a.DataOrViewAspect)
@@ -26974,7 +26974,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MetadataType>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MetadataType.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MetadataType());
             builder.AddElement<MetadataTypes>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -27052,7 +27052,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CharacterValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CharacterValue.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CharacterValue());
             builder.AddElement<MetadataStrings>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -27130,7 +27130,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Mdx>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Mdx.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Mdx());
             builder.AddElement<MdxMetadata>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -27219,8 +27219,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FutureMetadataBlock>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FutureMetadataBlock.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FutureMetadataBlock());
             builder.AddElement<FutureMetadata>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -27435,7 +27435,7 @@ public UInt32Value? Count
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MetadataBlock>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MetadataBlock.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MetadataBlock());
             builder.AddElement<MetadataBlocksType>()
                 .AddAttribute("count", a => a.Count);
         }
@@ -27842,7 +27842,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MetadataRecord>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MetadataRecord.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MetadataRecord());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.MetadataRecord.ElementType, 1, 0)
@@ -27968,7 +27968,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, 0, 1)
@@ -28069,10 +28069,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MdxKpi>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MdxMemberProp>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MdxSet>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MdxTuple>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MdxKpi.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MdxKpi());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MdxMemberProp.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MdxMemberProp());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MdxSet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MdxSet());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MdxTuple.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MdxTuple());
             builder.AddElement<Mdx>()
                 .AddAttribute("n", a => a.NameIndex, aBuilder =>
                 {
@@ -28303,7 +28303,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NameIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NameIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NameIndex());
             builder.AddElement<MdxTuple>()
                 .AddAttribute("c", a => a.MemberIndexCount)
                 .AddAttribute("ct", a => a.CultureCurrency)
@@ -28419,7 +28419,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NameIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NameIndex.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NameIndex());
             builder.AddElement<MdxSet>()
                 .AddAttribute("ns", a => a.SetDefinitionIndex, aBuilder =>
                 {
@@ -28726,8 +28726,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.XmlCellProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.XmlCellProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.XmlCellProperties());
             builder.AddElement<SingleXmlCell>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -28856,8 +28856,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.XmlProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.XmlProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.XmlProperties());
             builder.AddElement<XmlCellProperties>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -28991,7 +28991,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<XmlProperties>()
                 .AddAttribute("mapId", a => a.MapId, aBuilder =>
                 {
@@ -29095,8 +29095,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ForegroundColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.BackgroundColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ForegroundColor.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ForegroundColor());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.BackgroundColor.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.BackgroundColor());
             builder.AddElement<PatternFill>()
                 .AddAttribute("patternType", a => a.PatternType);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -29250,7 +29250,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.GradientStop>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.GradientStop.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.GradientStop());
             builder.AddElement<GradientFill>()
                 .AddAttribute("type", a => a.Type)
                 .AddAttribute("degree", a => a.Degree)
@@ -29337,7 +29337,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Color>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Color.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Color());
             builder.AddElement<GradientStop>()
                 .AddAttribute("position", a => a.Position, aBuilder =>
                 {
@@ -29692,21 +29692,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Condense>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Extend>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FontCharSet>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FontFamilyNumbering>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FontName>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FontScheme>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.VerticalTextAlignment>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Bold.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Italic.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Strike.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Condense.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Condense());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Extend.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Extend());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Outline.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FontCharSet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FontCharSet());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Color.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FontFamilyNumbering.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FontFamilyNumbering());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FontName.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FontName());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FontScheme.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FontScheme());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Underline.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.VerticalTextAlignment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Bold.ElementType, 0, 1),
@@ -29981,8 +29981,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.GradientFill>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PatternFill>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.GradientFill.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.GradientFill());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PatternFill.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PatternFill());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PatternFill.ElementType, 0, 1),
@@ -30112,15 +30112,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.StartBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.EndBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DiagonalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.VerticalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.HorizontalBorder>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.StartBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.StartBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.EndBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.EndBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DiagonalBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DiagonalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.VerticalBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.VerticalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.HorizontalBorder.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.HorizontalBorder());
             builder.AddElement<Border>()
                 .AddAttribute("diagonalUp", a => a.DiagonalUp)
                 .AddAttribute("diagonalDown", a => a.DiagonalDown)
@@ -30314,7 +30314,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RgbColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RgbColor.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RgbColor());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.RgbColor.ElementType, 1, 64)
@@ -30379,7 +30379,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Color>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Color.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Color());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Color.ElementType, 1, 10)
@@ -30484,7 +30484,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableStyleElement>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableStyleElement.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableStyleElement());
             builder.AddElement<TableStyle>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -30663,7 +30663,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<CellStyle>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("xfId", a => a.FormatId, aBuilder =>
@@ -30888,9 +30888,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Alignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Protection>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Alignment.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Alignment());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Protection.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Protection());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<CellFormat>()
                 .AddAttribute("numFmtId", a => a.NumberFormatId)
                 .AddAttribute("fontId", a => a.FontId)
@@ -31316,7 +31316,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExternalRow>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExternalRow.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExternalRow());
             builder.AddElement<ExternalSheetData>()
                 .AddAttribute("sheetId", a => a.SheetId, aBuilder =>
                 {
@@ -31398,7 +31398,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExternalCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExternalCell.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExternalCell());
             builder.AddElement<ExternalRow>()
                 .AddAttribute("r", a => a.RowIndex, aBuilder =>
                 {
@@ -31502,7 +31502,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Xstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Xstring.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Xstring());
             builder.AddElement<ExternalCell>()
                 .AddAttribute("r", a => a.CellReference, aBuilder =>
                 {
@@ -31589,7 +31589,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DdeItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DdeItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DdeItem());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.DdeItem.ElementType, 0, 0)
@@ -31694,7 +31694,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Values>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Values.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Values());
             builder.AddElement<DdeItem>()
                 .AddAttribute("name", a => a.Name)
                 .AddAttribute("ole", a => a.UseOle)
@@ -31799,7 +31799,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Value>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Value.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Value());
             builder.AddElement<Values>()
                 .AddAttribute("rows", a => a.Rows)
                 .AddAttribute("cols", a => a.Columns);
@@ -31879,7 +31879,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DdeLinkValue>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DdeLinkValue.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DdeLinkValue());
             builder.AddElement<Value>()
                 .AddAttribute("t", a => a.ValueType);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -31960,8 +31960,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OleItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.OleItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OleItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OleItem());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.OleItem.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.OleItem());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.OleItem.ElementType, 1, 1),
@@ -32043,10 +32043,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExternalDefinedNames>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetDataSet>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetNames>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.ExternalBookAlternateUrls>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExternalDefinedNames.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExternalDefinedNames());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetDataSet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetDataSet());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetNames.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetNames());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.ExternalBookAlternateUrls.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2021.ExtLinks2021.ExternalBookAlternateUrls());
             builder.AddElement<ExternalBook>()
                 .AddAttribute("r:id", a => a.Id, aBuilder =>
                 {
@@ -32191,7 +32191,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DdeItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DdeItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DdeItems());
             builder.AddElement<DdeLink>()
                 .AddAttribute("ddeService", a => a.DdeService, aBuilder =>
                 {
@@ -32303,7 +32303,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OleItems>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OleItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OleItems());
             builder.AddElement<OleLink>()
                 .AddAttribute("r:id", a => a.Id, aBuilder =>
                 {
@@ -32600,10 +32600,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculatedColumnFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TotalsRowFormula>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.XmlColumnProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculatedColumnFormula.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculatedColumnFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TotalsRowFormula.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TotalsRowFormula());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.XmlColumnProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.XmlColumnProperties());
             builder.AddElement<TableColumn>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -32947,7 +32947,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<XmlColumnProperties>()
                 .AddAttribute("mapId", a => a.MapId, aBuilder =>
                 {
@@ -33052,7 +33052,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Main>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Main.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Main());
             builder.AddElement<VolatileType>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -33132,7 +33132,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Topic>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Topic.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Topic());
             builder.AddElement<Main>()
                 .AddAttribute("first", a => a.First, aBuilder =>
                 {
@@ -33215,9 +33215,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TopicReferences>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Subtopic>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Xstring>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TopicReferences.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TopicReferences());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Subtopic.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Subtopic());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Xstring.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Xstring());
             builder.AddElement<Topic>()
                 .AddAttribute("t", a => a.ValueType);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -33822,7 +33822,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<CustomWorkbookView>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -34164,7 +34164,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<WorkbookView>()
                 .AddAttribute("visibility", a => a.Visibility)
                 .AddAttribute("minimized", a => a.Minimized)
@@ -34554,8 +34554,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FromMarker>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ToMarker>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FromMarker.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FromMarker());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ToMarker.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ToMarker());
             builder.AddElement<ObjectAnchor>()
                 .AddAttribute("moveWithCells", a => a.MoveWithCells)
                 .AddAttribute("sizeWithCells", a => a.SizeWithCells)
@@ -34795,10 +34795,10 @@ protected MarkerType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.RowOffset>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnId>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Spreadsheet.RowId>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.RowOffset.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.RowOffset());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.ColumnId());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Spreadsheet.RowId.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Spreadsheet.RowId());
         }
 
         /// <summary>
@@ -34918,7 +34918,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Id>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Id.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Id());
             builder.AddElement<ConditionalFormattingRuleExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -35000,7 +35000,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotHierarchy>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotHierarchy.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotHierarchy());
             builder.AddElement<PivotHierarchyExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -35082,7 +35082,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotField>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotField.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotField());
             builder.AddElement<PivotFieldExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -35164,7 +35164,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SourceConnection>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SourceConnection.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SourceConnection());
             builder.AddElement<CacheSourceExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -35903,7 +35903,7 @@ public EnumValue<DocumentFormat.OpenXml.Spreadsheet.BorderStyleValues>? Style
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Color>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Color.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Color());
             builder.AddElement<BorderPropertiesType>()
                 .AddAttribute("style", a => a.Style);
         }
@@ -36130,7 +36130,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor());
             builder.AddElement<ControlProperties>()
                 .AddAttribute("locked", a => a.Locked)
                 .AddAttribute("defaultSize", a => a.DefaultSize)
@@ -36348,7 +36348,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor());
             builder.AddElement<EmbeddedObjectProperties>()
                 .AddAttribute("locked", a => a.Locked)
                 .AddAttribute("defaultSize", a => a.DefaultSize)
@@ -36459,7 +36459,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TabColor>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TabColor.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TabColor());
             builder.AddElement<ChartSheetProperties>()
                 .AddAttribute("published", a => a.Published)
                 .AddAttribute("codeName", a => a.CodeName);
@@ -36543,8 +36543,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartSheetView>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartSheetView.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartSheetView());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ChartSheetView.ElementType, 1, 0),
@@ -36721,7 +36721,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomChartsheetView>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomChartsheetView.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomChartsheetView());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CustomChartsheetView.ElementType, 0, 0)
@@ -37244,7 +37244,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WebPublishItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WebPublishItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WebPublishItem());
             builder.AddElement<WebPublishItems>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -37312,8 +37312,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Color>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Color.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Color());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject.ElementType, 2, 3),
@@ -37410,8 +37410,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Color>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Color.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Color());
             builder.AddElement<DataBar>()
                 .AddAttribute("minLength", a => a.MinLength)
                 .AddAttribute("maxLength", a => a.MaxLength)
@@ -37523,7 +37523,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormatValueObject());
             builder.AddElement<IconSet>()
                 .AddAttribute("iconSet", a => a.IconSetValue)
                 .AddAttribute("showValue", a => a.ShowValue)
@@ -37593,7 +37593,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRuleExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRuleExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRuleExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRuleExtension.ElementType, 0, 0)
@@ -37668,7 +37668,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataReference.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataReference());
             builder.AddElement<DataReferences>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -37827,9 +37827,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TabColor>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OutlineProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageSetupProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TabColor.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TabColor());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OutlineProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OutlineProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageSetupProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageSetupProperties());
             builder.AddElement<SheetProperties>()
                 .AddAttribute("syncHorizontal", a => a.SyncHorizontal)
                 .AddAttribute("syncVertical", a => a.SyncVertical)
@@ -37948,8 +37948,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetView>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetView.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetView());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.SheetView.ElementType, 1, 0),
@@ -38434,7 +38434,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomSheetView>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomSheetView.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomSheetView());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CustomSheetView.ElementType, 1, 0)
@@ -38499,7 +38499,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.OleObject>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.OleObject.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.OleObject());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.OleObject.ElementType, 1, 65535)
@@ -38564,7 +38564,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Control>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Control.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Control());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Control.ElementType, 1, 65535)
@@ -38678,7 +38678,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Column>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Column.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Column());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Column.ElementType, 1, 0)
@@ -38743,7 +38743,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Row>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Row.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Row());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Row.ElementType, 0, 0)
@@ -38859,7 +38859,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataReferences>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataReferences.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataReferences());
             builder.AddElement<DataConsolidate>()
                 .AddAttribute("function", a => a.Function)
                 .AddAttribute("leftLabels", a => a.LeftLabels)
@@ -38967,8 +38967,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRule>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRule.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormattingRule());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
             builder.AddElement<ConditionalFormatting>()
                 .AddAttribute("pivot", a => a.Pivot)
                 .AddAttribute("sqref", a => a.SequenceOfReferences);
@@ -39038,7 +39038,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomProperty.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomProperty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CustomProperty.ElementType, 1, 0)
@@ -39113,7 +39113,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MemberProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MemberProperty.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MemberProperty());
             builder.AddElement<MemberProperties>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -39200,7 +39200,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Member>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Member.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Member());
             builder.AddElement<Members>()
                 .AddAttribute("count", a => a.Count)
                 .AddAttribute("level", a => a.Level);
@@ -39268,7 +39268,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotHierarchyExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotHierarchyExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotHierarchyExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PivotHierarchyExtension.ElementType, 0, 0)
@@ -39343,7 +39343,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Item>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Item.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Item());
             builder.AddElement<Items>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -39410,7 +39410,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotArea>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotArea.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotArea());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PivotArea.ElementType, 1, 1)
@@ -39488,7 +39488,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFieldExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFieldExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFieldExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PivotFieldExtension.ElementType, 0, 0)
@@ -39645,8 +39645,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Pages>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RangeSets>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Pages.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Pages());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RangeSets.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RangeSets());
             builder.AddElement<Consolidation>()
                 .AddAttribute("autoPage", a => a.AutoPage);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -39740,7 +39740,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheSourceExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheSourceExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheSourceExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CacheSourceExtension.ElementType, 0, 0)
@@ -39956,7 +39956,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ObjectAnchor());
             builder.AddElement<CommentProperties>()
                 .AddAttribute("locked", a => a.Locked)
                 .AddAttribute("defaultSize", a => a.DefaultSize)
@@ -40352,9 +40352,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DateGroupItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Filter>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Filter>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DateGroupItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DateGroupItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Filter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Filter());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Filter.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Filter());
             builder.AddElement<Filters>()
                 .AddAttribute("blank", a => a.Blank)
                 .AddAttribute("calendarType", a => a.CalendarType);
@@ -40512,7 +40512,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomFilter());
             builder.AddElement<CustomFilters>()
                 .AddAttribute("and", a => a.And);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -40799,9 +40799,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.SlicerCachePivotTables>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.SlicerCacheHideItemsWithNoData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TableSlicerCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.SlicerCachePivotTables.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.SlicerCachePivotTables());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.SlicerCacheHideItemsWithNoData.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.SlicerCacheHideItemsWithNoData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TableSlicerCache.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TableSlicerCache());
             builder.AddElement<SlicerCacheDefinitionExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -40886,8 +40886,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.MovingPeriodState>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.MovingPeriodState.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.MovingPeriodState());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotFilter.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotFilter());
             builder.AddElement<PivotFilterExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -40970,7 +40970,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.QueryTable>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.QueryTable.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.QueryTable());
             builder.AddElement<QueryTableExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -41383,7 +41383,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Tables>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Tables.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Tables());
             builder.AddElement<WebQueryProperties>()
                 .AddAttribute("xml", a => a.XmlSource)
                 .AddAttribute("sourceData", a => a.SourceData)
@@ -41636,7 +41636,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TextFields>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TextFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TextFields());
             builder.AddElement<TextProperties>()
                 .AddAttribute("prompt", a => a.Prompt)
                 .AddAttribute("fileType", a => a.FileType)
@@ -41746,7 +41746,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Parameter>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Parameter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Parameter());
             builder.AddElement<Parameters>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -41813,7 +41813,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConnectionExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConnectionExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConnectionExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ConnectionExtension.ElementType, 0, 0)
@@ -41889,8 +41889,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Connection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.Connection>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Connection.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Connection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.Connection.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.Connection());
             builder.AddElement<ConnectionExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -41973,7 +41973,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TextField>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TextField.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TextField());
             builder.AddElement<TextFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -42185,12 +42185,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.BooleanItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DateTimeItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ErrorItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MissingItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.StringItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.BooleanItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.BooleanItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DateTimeItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DateTimeItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ErrorItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ErrorItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MissingItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MissingItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberItem());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.StringItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.StringItem());
             builder.AddElement<SharedItems>()
                 .AddAttribute("containsSemiMixedTypes", a => a.ContainsSemiMixedTypes)
                 .AddAttribute("containsNonDate", a => a.ContainsNonDate)
@@ -42300,9 +42300,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DiscreteProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.GroupItems>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RangeProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DiscreteProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DiscreteProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.GroupItems.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.GroupItems());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RangeProperties.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RangeProperties());
             builder.AddElement<FieldGroup>()
                 .AddAttribute("par", a => a.ParentId)
                 .AddAttribute("base", a => a.Base);
@@ -42375,7 +42375,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheFieldExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheFieldExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheFieldExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CacheFieldExtension.ElementType, 0, 0)
@@ -42451,8 +42451,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.CacheField>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.CachedUniqueNames>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.CacheField.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.CacheField());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.CachedUniqueNames.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.CachedUniqueNames());
             builder.AddElement<CacheFieldExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -42535,7 +42535,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FieldUsage>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FieldUsage.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FieldUsage());
             builder.AddElement<FieldsUsage>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -42612,7 +42612,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.GroupLevel>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.GroupLevel.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.GroupLevel());
             builder.AddElement<GroupLevels>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -42679,7 +42679,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheHierarchyExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheHierarchyExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheHierarchyExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CacheHierarchyExtension.ElementType, 0, 0)
@@ -42755,8 +42755,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.CacheHierarchy>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.CacheHierarchy>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.CacheHierarchy.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.CacheHierarchy());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.CacheHierarchy.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.CacheHierarchy());
             builder.AddElement<CacheHierarchyExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -42829,7 +42829,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculatedMemberExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculatedMemberExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculatedMemberExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CalculatedMemberExtension.ElementType, 0, 0)
@@ -42905,8 +42905,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.CalculatedMember>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.CalculatedMember>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.CalculatedMember.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.CalculatedMember());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.CalculatedMember.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.CalculatedMember());
             builder.AddElement<CalculatedMemberExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -42979,7 +42979,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataFieldExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataFieldExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataFieldExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.DataFieldExtension.ElementType, 0, 0)
@@ -43055,8 +43055,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DataField>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DataField>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DataField.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DataField());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DataField.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DataField());
             builder.AddElement<DataFieldExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -43129,7 +43129,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFilterExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFilterExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFilterExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PivotFilterExtension.ElementType, 0, 0)
@@ -43267,10 +43267,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.QueryTableDeletedFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.QueryTableFields>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SortState>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.QueryTableDeletedFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.QueryTableDeletedFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.QueryTableFields.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.QueryTableFields());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SortState.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SortState());
             builder.AddElement<QueryTableRefresh>()
                 .AddAttribute("preserveSortFilterLayout", a => a.PreserveSortFilterLayout)
                 .AddAttribute("fieldIdWrapped", a => a.FieldIdWrapped)
@@ -43402,7 +43402,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.QueryTableExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.QueryTableExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.QueryTableExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.QueryTableExtension.ElementType, 0, 0)
@@ -43509,7 +43509,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ProtectedRange>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ProtectedRange.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ProtectedRange());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ProtectedRange.ElementType, 1, 0)
@@ -43604,7 +43604,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Scenario>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Scenario.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Scenario());
             builder.AddElement<Scenarios>()
                 .AddAttribute("current", a => a.Current)
                 .AddAttribute("show", a => a.Show)
@@ -43683,7 +43683,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MergeCell>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MergeCell.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MergeCell());
             builder.AddElement<MergeCells>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -43790,7 +43790,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataValidation>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataValidation.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataValidation());
             builder.AddElement<DataValidations>()
                 .AddAttribute("disablePrompts", a => a.DisablePrompts)
                 .AddAttribute("xWindow", a => a.XWindow)
@@ -43863,7 +43863,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Hyperlink>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Hyperlink());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Hyperlink.ElementType, 1, 0)
@@ -43928,7 +43928,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellWatch>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellWatch.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellWatch());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CellWatch.ElementType, 1, 0)
@@ -43994,8 +43994,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.IgnoredError>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.IgnoredError.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.IgnoredError());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.IgnoredError.ElementType, 1, 9),
@@ -44071,7 +44071,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TablePart>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TablePart.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TablePart());
             builder.AddElement<TableParts>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -44138,7 +44138,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WorksheetExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WorksheetExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WorksheetExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.WorksheetExtension.ElementType, 0, 0)
@@ -44220,14 +44220,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattings>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DataValidations>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.IgnoredErrors>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.ProtectedRanges>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerList>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SparklineGroups>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineReferences>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.WebExtensions>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattings.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ConditionalFormattings());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DataValidations.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DataValidations());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.IgnoredErrors.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.IgnoredErrors());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.ProtectedRanges.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.ProtectedRanges());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerList.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerList());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SparklineGroups.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SparklineGroups());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineReferences.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineReferences());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.WebExtensions.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.WebExtensions());
             builder.AddElement<WorksheetExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -44316,7 +44316,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.NumberingFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.NumberingFormat());
             builder.AddElement<NumberingFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -44406,7 +44406,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Font>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Font.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Font());
             builder.AddElement<Fonts>()
                 .AddAttribute("count", a => a.Count)
                 .AddAttribute("x14ac:knownFonts", a => a.KnownFonts, aBuilder =>
@@ -44487,7 +44487,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Fill>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Fill.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Fill());
             builder.AddElement<Fills>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -44564,7 +44564,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Border>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Border.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Border());
             builder.AddElement<Borders>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -44641,7 +44641,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellFormat());
             builder.AddElement<CellStyleFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -44718,7 +44718,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellFormat());
             builder.AddElement<CellFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -44795,7 +44795,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CellStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CellStyle.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CellStyle());
             builder.AddElement<CellStyles>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -44872,7 +44872,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DifferentialFormat());
             builder.AddElement<DifferentialFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -44969,7 +44969,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableStyle.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableStyle());
             builder.AddElement<TableStyles>()
                 .AddAttribute("count", a => a.Count)
                 .AddAttribute("defaultTableStyle", a => a.DefaultTableStyle)
@@ -45040,8 +45040,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.IndexedColors>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MruColors>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.IndexedColors.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.IndexedColors());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MruColors.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MruColors());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.IndexedColors.ElementType, 0, 1),
@@ -45133,7 +45133,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.StylesheetExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.StylesheetExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.StylesheetExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.StylesheetExtension.ElementType, 0, 0)
@@ -45211,10 +45211,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DifferentialFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerStyles>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineStyles>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DifferentialFormats.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DifferentialFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerStyles.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerStyles());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineStyles.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineStyles());
             builder.AddElement<StylesheetExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -45408,7 +45408,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotField>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotField.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotField());
             builder.AddElement<PivotFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -45485,7 +45485,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Field>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Field.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Field());
             builder.AddElement<RowFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -45562,7 +45562,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowItem());
             builder.AddElement<RowItems>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -45639,7 +45639,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Field>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Field.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Field());
             builder.AddElement<ColumnFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -45716,7 +45716,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowItem());
             builder.AddElement<ColumnItems>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -45793,7 +45793,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PageField>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PageField.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PageField());
             builder.AddElement<PageFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -45870,7 +45870,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DataField>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DataField.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DataField());
             builder.AddElement<DataFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -45947,7 +45947,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Format>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Format.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Format());
             builder.AddElement<Formats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46024,7 +46024,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ConditionalFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ConditionalFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ConditionalFormat());
             builder.AddElement<ConditionalFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46101,7 +46101,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ChartFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ChartFormat.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ChartFormat());
             builder.AddElement<ChartFormats>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46178,7 +46178,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotHierarchy>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotHierarchy.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotHierarchy());
             builder.AddElement<PivotHierarchies>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46353,7 +46353,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotFilter>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotFilter.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotFilter());
             builder.AddElement<PivotFilters>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46430,7 +46430,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.RowHierarchyUsage>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.RowHierarchyUsage.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.RowHierarchyUsage());
             builder.AddElement<RowHierarchiesUsage>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46507,7 +46507,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchyUsage>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchyUsage.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ColumnHierarchyUsage());
             builder.AddElement<ColumnHierarchiesUsage>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46574,7 +46574,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PivotTableDefinitionExtension.ElementType, 0, 0)
@@ -46652,10 +46652,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotTableDefinition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotTableData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotTableUISettings>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.PivotVersionInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotTableDefinition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotTableDefinition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotTableData.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotTableData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotTableUISettings.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotTableUISettings());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.PivotVersionInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.PivotVersionInfo());
             builder.AddElement<PivotTableDefinitionExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -46752,9 +46752,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheSourceExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Consolidation>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WorksheetSource>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheSourceExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheSourceExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Consolidation.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Consolidation());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WorksheetSource.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WorksheetSource());
             builder.AddElement<CacheSource>()
                 .AddAttribute("type", a => a.Type, aBuilder =>
                 {
@@ -46878,7 +46878,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheField>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheField.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheField());
             builder.AddElement<CacheFields>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46955,7 +46955,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CacheHierarchy>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CacheHierarchy.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CacheHierarchy());
             builder.AddElement<CacheHierarchies>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -47032,7 +47032,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Kpi>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Kpi.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Kpi());
             builder.AddElement<Kpis>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -47103,11 +47103,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Entries>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.QueryCache>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ServerFormats>();
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Sets>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExtensionList.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExtensionList());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Entries.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Entries());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.QueryCache.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.QueryCache());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ServerFormats.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ServerFormats());
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Sets.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Sets());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Entries.ElementType, 0, 1),
@@ -47251,7 +47251,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculatedItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculatedItem.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculatedItem());
             builder.AddElement<CalculatedItems>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -47328,7 +47328,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CalculatedMember>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CalculatedMember.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CalculatedMember());
             builder.AddElement<CalculatedMembers>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -47405,7 +47405,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Dimension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Dimension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Dimension());
             builder.AddElement<Dimensions>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -47482,7 +47482,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MeasureGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MeasureGroup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MeasureGroup());
             builder.AddElement<MeasureGroups>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -47559,7 +47559,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.MeasureDimensionMap>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.MeasureDimensionMap.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.MeasureDimensionMap());
             builder.AddElement<Maps>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -47626,7 +47626,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotCacheDefinitionExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotCacheDefinitionExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotCacheDefinitionExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PivotCacheDefinitionExtension.ElementType, 0, 0)
@@ -47709,15 +47709,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotCacheDefinition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotCacheDecoupled>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotCacheIdVersion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelinePivotCacheDefinition>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays.PivotCacheDynamicArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheRichInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2021.Excel.Pivot.Xsdboolean>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotCacheDefinition.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotCacheDefinition());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotCacheDecoupled.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotCacheDecoupled());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotCacheIdVersion.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotCacheIdVersion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelinePivotCacheDefinition.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelinePivotCacheDefinition());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays.PivotCacheDynamicArray.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotDynamicArrays.PivotCacheDynamicArray());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheRichInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotRichData.PivotCacheRichInfo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2021.Excel.Pivot.Xsdboolean.ElementType, static () => new DocumentFormat.OpenXml.Office2021.Excel.Pivot.Xsdboolean());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.PivotAutoRefresh.Xsdboolean());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2022.PivotVersionInfo.CacheVersionInfo());
             builder.AddElement<PivotCacheDefinitionExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -47797,7 +47797,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.SheetName>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.SheetName.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.SheetName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.SheetName.ElementType, 1, 65534)
@@ -47862,7 +47862,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExternalDefinedName>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExternalDefinedName.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExternalDefinedName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ExternalDefinedName.ElementType, 0, 0)
@@ -47927,7 +47927,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExternalSheetData>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExternalSheetData.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExternalSheetData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ExternalSheetData.ElementType, 1, 0)
@@ -48002,7 +48002,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableColumn>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableColumn.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableColumn());
             builder.AddElement<TableColumns>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -48156,7 +48156,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.TableExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.TableExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.TableExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.TableExtension.ElementType, 0, 0)
@@ -48232,8 +48232,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.MsForm>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.Table.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.MsForm.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.MsForms.MsForm());
             builder.AddElement<TableExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
@@ -48934,7 +48934,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WorkbookView>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WorkbookView.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WorkbookView());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.WorkbookView.ElementType, 1, 0)
@@ -48999,7 +48999,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.Sheet>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.Sheet.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.Sheet());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.Sheet.ElementType, 1, 32767)
@@ -49074,7 +49074,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.FunctionGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.FunctionGroup.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.FunctionGroup());
             builder.AddElement<FunctionGroups>()
                 .AddAttribute("builtInGroupCount", a => a.BuiltInGroupCount);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 0)
@@ -49142,7 +49142,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.ExternalReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.ExternalReference.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.ExternalReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.ExternalReference.ElementType, 1, 65534)
@@ -49207,7 +49207,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.DefinedName>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.DefinedName.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.DefinedName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.DefinedName.ElementType, 0, 0)
@@ -49491,7 +49491,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.CustomWorkbookView>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.CustomWorkbookView.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.CustomWorkbookView());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.CustomWorkbookView.ElementType, 1, 0)
@@ -49556,7 +49556,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.PivotCache>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.PivotCache.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.PivotCache());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.PivotCache.ElementType, 1, 0)
@@ -49836,7 +49836,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WebPublishObject>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WebPublishObject.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WebPublishObject());
             builder.AddElement<WebPublishObjects>()
                 .AddAttribute("count", a => a.Count);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -49903,7 +49903,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Spreadsheet.WorkbookExtension>();
+            builder.AddChild(DocumentFormat.OpenXml.Spreadsheet.WorkbookExtension.ElementType, static () => new DocumentFormat.OpenXml.Spreadsheet.WorkbookExtension());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Spreadsheet.WorkbookExtension.ElementType, 0, 0)
@@ -49990,19 +49990,19 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.PivotCaches>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotCaches>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotCaches>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.DefinedNames>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.SlicerCaches>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.SlicerCaches>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Excel.WorkbookProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.DataModel>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.PivotTableReferences>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.TimelineCacheReferences>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Excel.WorkbookProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.ExternalCodeService.ExternalCodeService>();
-            builder.AddChild<DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.WorkbookCompatibilityVersion.Version>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.PivotCaches.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.PivotCaches());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotCaches.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotCaches());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotCaches.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineCachePivotCaches());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.DefinedNames.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.DefinedNames());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.SlicerCaches.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.SlicerCaches());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.SlicerCaches.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.SlicerCaches());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Excel.WorkbookProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Excel.WorkbookProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.DataModel.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.DataModel());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.PivotTableReferences.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.PivotTableReferences());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.TimelineCacheReferences.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.TimelineCacheReferences());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Excel.WorkbookProperties.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Excel.WorkbookProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.ExternalCodeService.ExternalCodeService.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2023.ExternalCodeService.ExternalCodeService());
+            builder.AddChild(DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.WorkbookCompatibilityVersion.Version.ElementType, static () => new DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.WorkbookCompatibilityVersion.Version());
             builder.AddElement<WorkbookExtension>()
                 .AddAttribute("uri", a => a.Uri, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_wordprocessingml_2006_main.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_wordprocessingml_2006_main.g.cs
index 9ebc1991d..bdeca0071 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_wordprocessingml_2006_main.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas_openxmlformats_org_wordprocessingml_2006_main.g.cs
@@ -8102,10 +8102,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingLevelReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Inserted>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingChange>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingLevelReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingLevelReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Inserted.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Inserted());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingChange());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.NumberingLevelReference.ElementType, 0, 1),
@@ -8230,12 +8230,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BetweenBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BarBorder>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BetweenBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BetweenBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BarBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BarBorder());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, 0, 1),
@@ -8569,7 +8569,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TabStop>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TabStop.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TabStop());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TabStop.ElementType, 1, 0)
@@ -9735,7 +9735,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesExtended>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesExtended.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesExtended());
             builder.AddElement<ParagraphPropertiesChange>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -11112,22 +11112,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.OleObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Arc>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Curve>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Line>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Oval>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.PolyLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Rectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.RoundRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shapetype>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Control>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ObjectEmbed>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ObjectLink>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.OleObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.OleObject());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Arc.ElementType, static () => new DocumentFormat.OpenXml.Vml.Arc());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Curve.ElementType, static () => new DocumentFormat.OpenXml.Vml.Curve());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Group.ElementType, static () => new DocumentFormat.OpenXml.Vml.Group());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageFile.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageFile());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Line.ElementType, static () => new DocumentFormat.OpenXml.Vml.Line());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Oval.ElementType, static () => new DocumentFormat.OpenXml.Vml.Oval());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.PolyLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.PolyLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Rectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.Rectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.RoundRectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.RoundRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shape.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shapetype.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shapetype());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Control.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Control());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ObjectEmbed.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ObjectEmbed());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ObjectLink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ObjectLink());
             builder.AddElement<EmbeddedObject>()
                 .AddAttribute("w:dxaOrig", a => a.DxaOriginal)
                 .AddAttribute("w:dyaOrig", a => a.DyaOriginal)
@@ -11256,20 +11256,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.OleObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Arc>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Curve>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Line>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Oval>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.PolyLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Rectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.RoundRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shapetype>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Control>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MovieReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.OleObject.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.OleObject());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Arc.ElementType, static () => new DocumentFormat.OpenXml.Vml.Arc());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Curve.ElementType, static () => new DocumentFormat.OpenXml.Vml.Curve());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Group.ElementType, static () => new DocumentFormat.OpenXml.Vml.Group());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageFile.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageFile());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Line.ElementType, static () => new DocumentFormat.OpenXml.Vml.Line());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Oval.ElementType, static () => new DocumentFormat.OpenXml.Vml.Oval());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.PolyLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.PolyLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Rectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.Rectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.RoundRectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.RoundRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shape.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shapetype.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shapetype());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Control.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Control());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MovieReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MovieReference());
             builder.AddElement<Picture>()
                 .AddAttribute("w14:anchorId", a => a.AnchorId, aBuilder =>
                 {
@@ -11406,9 +11406,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FieldData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FormFieldData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingChange>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FieldData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FieldData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FormFieldData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FormFieldData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingChange());
             builder.AddElement<FieldChar>()
                 .AddAttribute("w:fldCharType", a => a.FieldCharType, aBuilder =>
                 {
@@ -11523,9 +11523,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RubyContent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RubyBase>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RubyProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RubyContent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RubyContent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RubyBase.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RubyBase());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RubyProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RubyProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.RubyProperties.ElementType, 1, 1),
@@ -11752,8 +11752,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.Anchor>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.Wordprocessing.Inline>();
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.Anchor.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.Anchor());
+            builder.AddChild(DocumentFormat.OpenXml.Drawing.Wordprocessing.Inline.ElementType, static () => new DocumentFormat.OpenXml.Drawing.Wordprocessing.Inline());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Drawing.Wordprocessing.Anchor.ElementType, 1, 1),
@@ -14230,7 +14230,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousRunProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousRunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousRunProperties());
             builder.AddElement<RunPropertiesChange>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -14382,57 +14382,57 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emphasis>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Highlight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kern>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Languages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Caps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SmallCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoubleStrike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emboss>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Imprint>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoProof>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Vanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightToLeftText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpecVanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunPropertiesChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Spacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CharacterScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.FillTextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Glow>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Ligatures>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NumberSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Properties3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Reflection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Scene3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.StylisticSets>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Border.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Color.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emphasis.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emphasis());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Highlight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Highlight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kern.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kern());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Languages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Languages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Bold.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Italic.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Caps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Caps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SmallCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SmallCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Strike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoubleStrike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoubleStrike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emboss.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emboss());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Imprint.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Imprint());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoProof.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoProof());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Vanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Vanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightToLeftText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightToLeftText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpecVanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpecVanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunPropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunPropertiesChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Spacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Spacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Position.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextEffect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CharacterScale.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CharacterScale());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.FillTextEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.FillTextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Glow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Glow());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Ligatures.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Ligatures());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NumberSpacing.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NumberSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Properties3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Properties3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Reflection.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Reflection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Scene3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Scene3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.StylisticSets.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.StylisticSets());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -15329,8 +15329,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunProperties());
             builder.AddElement<InsertedMathControl>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -15484,7 +15484,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunProperties());
             builder.AddElement<DeletedMathControl>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -15812,9 +15812,9 @@ public StringValue? Id
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedMathControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedMathControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedMathControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedMathControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunProperties());
             builder.AddElement<MathControlMoveType>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -15949,64 +15949,64 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, 0, 1),
@@ -16290,64 +16290,64 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FieldData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FieldData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FieldData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<SimpleFieldRuby>()
                 .AddAttribute("w:instr", a => a.Instruction, aBuilder =>
                 {
@@ -16689,63 +16689,63 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<HyperlinkRuby>()
                 .AddAttribute("w:tgtFrame", a => a.TargetFrame, aBuilder =>
                 {
@@ -17020,39 +17020,39 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Break>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoBreakHyphen>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SoftHyphen>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DayShort>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MonthShort>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.YearShort>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DayLong>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MonthLong>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.YearLong>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AnnotationReferenceMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteReferenceMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnoteReferenceMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SeparatorMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContinuationSeparatorMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageNumber>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CarriageReturn>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TabChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LastRenderedPageBreak>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FieldChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnoteReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EmbeddedObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Picture>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PositionalTab>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Ruby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SymbolChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Text>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FieldCode>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedFieldCode>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Break.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Break());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoBreakHyphen.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoBreakHyphen());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SoftHyphen.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SoftHyphen());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DayShort.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DayShort());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MonthShort.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MonthShort());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.YearShort.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.YearShort());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DayLong.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DayLong());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MonthLong.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MonthLong());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.YearLong.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.YearLong());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AnnotationReferenceMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AnnotationReferenceMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteReferenceMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteReferenceMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnoteReferenceMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnoteReferenceMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SeparatorMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SeparatorMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContinuationSeparatorMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContinuationSeparatorMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageNumber.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageNumber());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CarriageReturn.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CarriageReturn());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TabChar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TabChar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LastRenderedPageBreak.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LastRenderedPageBreak());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FieldChar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FieldChar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnoteReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnoteReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EmbeddedObject.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EmbeddedObject());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Picture.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Picture());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PositionalTab.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PositionalTab());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Ruby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Ruby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SymbolChar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SymbolChar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Text.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Text());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FieldCode.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FieldCode());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedFieldCode.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedFieldCode());
             builder.AddElement<Run>()
                 .AddAttribute("w:rsidRPr", a => a.RsidRunProperties, aBuilder =>
                 {
@@ -17209,29 +17209,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentRunRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentRunRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentRunRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, 0, 1),
@@ -18715,62 +18715,62 @@ public StringValue? Id
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<RunTrackChangeType>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -18919,29 +18919,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, 0, 1),
@@ -19093,41 +19093,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, 0, 1),
@@ -19296,29 +19296,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, 0, 1),
@@ -19600,67 +19600,67 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<Paragraph>()
                 .AddAttribute("w:rsidRPr", a => a.RsidParagraphMarkRevision, aBuilder =>
                 {
@@ -19959,41 +19959,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -20284,41 +20284,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TablePropertyExceptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableRowProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TablePropertyExceptions.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TablePropertyExceptions());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableRowProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableRowProperties());
             builder.AddElement<TableRow>()
                 .AddAttribute("w:rsidRPr", a => a.RsidTableRowMarkRevision, aBuilder =>
                 {
@@ -20547,40 +20547,40 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, 0, 1),
@@ -20742,29 +20742,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, 0, 1),
@@ -20917,42 +20917,42 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunk>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunk.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunk());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TableCellProperties.ElementType, 0, 1),
@@ -21164,40 +21164,40 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, 0, 1),
@@ -21359,29 +21359,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtEndCharProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.SdtProperties.ElementType, 0, 1),
@@ -21559,67 +21559,67 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.CustomXmlProperties.ElementType, 0, 1),
@@ -21933,67 +21933,67 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FieldData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FieldData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FieldData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<SimpleField>()
                 .AddAttribute("w:instr", a => a.Instruction, aBuilder =>
                 {
@@ -22365,66 +22365,66 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<Hyperlink>()
                 .AddAttribute("w:tgtFrame", a => a.TargetFrame, aBuilder =>
                 {
@@ -22728,66 +22728,66 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<BidirectionalOverride>()
                 .AddAttribute("w:val", a => a.Val);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -23073,66 +23073,66 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
             builder.Availability = FileFormatVersions.Office2010;
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<BidirectionalEmbedding>()
                 .AddAttribute("w:val", a => a.Val);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -24423,16 +24423,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StartBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsideHorizontalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsideVerticalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopLeftToBottomRightCellBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopRightToBottomLeftCellBorder>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StartBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StartBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsideHorizontalBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsideHorizontalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsideVerticalBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsideVerticalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopLeftToBottomRightCellBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopLeftToBottomRightCellBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopRightToBottomLeftCellBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopRightToBottomLeftCellBorder());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, 0, 1),
@@ -25252,12 +25252,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LeftMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StartMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BottomMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndMargin>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LeftMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LeftMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StartMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StartMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BottomMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BottomMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndMargin());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TopMargin.ElementType, 0, 1),
@@ -26025,14 +26025,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StartBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsideHorizontalBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsideVerticalBorder>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StartBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StartBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsideHorizontalBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsideHorizontalBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsideVerticalBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsideVerticalBorder());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, 0, 1),
@@ -26258,12 +26258,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StartMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BottomMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellLeftMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellRightMargin>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StartMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StartMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BottomMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BottomMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellLeftMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellLeftMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellRightMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellRightMargin());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TopMargin.ElementType, 0, 1),
@@ -26520,7 +26520,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunkProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunkProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunkProperties());
             builder.AddElement<AltChunk>()
                 .AddAttribute("r:id", a => a.Id);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -26755,10 +26755,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnotePosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingRestart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnotePosition.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnotePosition());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingRestart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingRestart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.FootnotePosition.ElementType, 0, 1),
@@ -26887,10 +26887,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnotePosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingRestart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnotePosition.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnotePosition());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingRestart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingRestart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.EndnotePosition.ElementType, 0, 1),
@@ -27408,10 +27408,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightBorder>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightBorder());
             builder.AddElement<PageBorders>()
                 .AddAttribute("w:zOrder", a => a.ZOrder)
                 .AddAttribute("w:display", a => a.Display)
@@ -27778,7 +27778,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Column>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Column.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Column());
             builder.AddElement<Columns>()
                 .AddAttribute("w:equalWidth", a => a.EqualWidth)
                 .AddAttribute("w:space", a => a.Space, aBuilder =>
@@ -27980,7 +27980,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RecipientData>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RecipientData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RecipientData());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.RecipientData.ElementType, 1, 0)
@@ -28079,41 +28079,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunk>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunk.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunk());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 1, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -28275,7 +28275,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Comment>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Comment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Comment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Comment.ElementType, 0, 0)
@@ -28371,7 +28371,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Footnote>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Footnote.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Footnote());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Footnote.ElementType, 0, 1)
@@ -28467,7 +28467,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Endnote>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Endnote.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Endnote());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Endnote.ElementType, 0, 1)
@@ -28597,41 +28597,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunk>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunk.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunk());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 1, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -28858,41 +28858,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunk>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunk.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunk());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 1, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -29118,41 +29118,41 @@ protected HeaderFooterType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunk>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunk.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunk());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
         }
     }
 
@@ -29312,109 +29312,109 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.CustomXmlSchemaReferences.SchemaLibrary>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Captions>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CharacterSpacingControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ColorSchemeMapping>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Compatibility>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocumentProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Rsids>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocumentType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocumentVariables>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnoteDocumentWideProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ForceUpgrade>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteDocumentWideProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoLineBreaksAfterKinsoku>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoLineBreaksBeforeKinsoku>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ThemeFontLanguages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MailMerge>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DefaultTabStop>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookFoldPrintingSheets>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RemovePersonalInformation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RemoveDateAndTime>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotDisplayPageBoundaries>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DisplayBackgroundShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrintPostScriptOverText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrintFractionalCharacterWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrintFormsData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EmbedTrueTypeFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EmbedSystemFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SaveSubsetFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SaveFormsData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MirrorMargins>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AlignBorderAndEdges>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BordersDoNotSurroundHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BordersDoNotSurroundFooter>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GutterAtTop>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HideSpellingErrors>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HideGrammaticalErrors>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FormsDesign>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LinkStyles>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TrackRevisions>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotTrackMoves>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotTrackFormatting>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoFormatOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleLockThemesPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleLockStylesPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoHyphenation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotHyphenateCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ShowEnvelope>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EvenAndOddHeaders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookFoldReversePrinting>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookFoldPrinting>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotUseMarginsForDrawingGridOrigin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotShadeFormData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoPunctuationKerning>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrintTwoOnOne>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StrictFirstAndLastChars>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SavePreviewPicture>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotValidateAgainstSchema>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SaveInvalidXml>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.IgnoreMixedContent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AlwaysShowPlaceholderText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotDemarcateInvalidXml>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SaveXmlDataOnly>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UseXsltWhenSaving>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ShowXmlTags>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AlwaysMergeEmptyNamespace>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UpdateFieldsOnOpen>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UICompatibleWith97To2003>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotIncludeSubdocsInStats>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotAutoCompressPictures>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.ChartTrackingRefBased>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofState>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ReadModeInkLockDown>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AttachedTemplate>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SaveThroughXslt>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HeaderShapeDefaults>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ShapeDefaults>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AttachedSchema>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DecimalSymbol>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ListSeparator>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ClickAndTypeStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DefaultTableStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StylePaneFormatFilter>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StylePaneSortMethods>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RevisionView>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HyphenationZone>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DrawingGridHorizontalSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DrawingGridVerticalSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DrawingGridHorizontalOrigin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DrawingGridVerticalOrigin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SummaryLength>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DisplayHorizontalDrawingGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DisplayVerticalDrawingGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConsecutiveHyphenLimit>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.View>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WriteProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ActiveWritingStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Zoom>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DefaultImageDpi>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DocumentId>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.DiscardImageEditingData>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ConflictMode>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.PersistentDocumentId>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathProperties.ElementType, static () => new DocumentFormat.OpenXml.Math.MathProperties());
+            builder.AddChild(DocumentFormat.OpenXml.CustomXmlSchemaReferences.SchemaLibrary.ElementType, static () => new DocumentFormat.OpenXml.CustomXmlSchemaReferences.SchemaLibrary());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Captions.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Captions());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CharacterSpacingControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CharacterSpacingControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ColorSchemeMapping.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ColorSchemeMapping());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Compatibility.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Compatibility());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocumentProtection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocumentProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Rsids.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Rsids());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocumentType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocumentType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocumentVariables.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocumentVariables());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnoteDocumentWideProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnoteDocumentWideProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ForceUpgrade.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ForceUpgrade());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteDocumentWideProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteDocumentWideProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoLineBreaksAfterKinsoku.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoLineBreaksAfterKinsoku());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoLineBreaksBeforeKinsoku.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoLineBreaksBeforeKinsoku());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ThemeFontLanguages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ThemeFontLanguages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MailMerge.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MailMerge());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DefaultTabStop.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DefaultTabStop());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookFoldPrintingSheets.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookFoldPrintingSheets());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RemovePersonalInformation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RemovePersonalInformation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RemoveDateAndTime.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RemoveDateAndTime());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotDisplayPageBoundaries.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotDisplayPageBoundaries());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DisplayBackgroundShape.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DisplayBackgroundShape());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrintPostScriptOverText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrintPostScriptOverText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrintFractionalCharacterWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrintFractionalCharacterWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrintFormsData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrintFormsData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EmbedTrueTypeFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EmbedTrueTypeFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EmbedSystemFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EmbedSystemFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SaveSubsetFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SaveSubsetFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SaveFormsData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SaveFormsData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MirrorMargins.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MirrorMargins());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AlignBorderAndEdges.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AlignBorderAndEdges());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BordersDoNotSurroundHeader.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BordersDoNotSurroundHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BordersDoNotSurroundFooter.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BordersDoNotSurroundFooter());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GutterAtTop.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GutterAtTop());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HideSpellingErrors.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HideSpellingErrors());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HideGrammaticalErrors.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HideGrammaticalErrors());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FormsDesign.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FormsDesign());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LinkStyles.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LinkStyles());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TrackRevisions.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TrackRevisions());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotTrackMoves.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotTrackMoves());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotTrackFormatting.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotTrackFormatting());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoFormatOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoFormatOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleLockThemesPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleLockThemesPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleLockStylesPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleLockStylesPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoHyphenation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoHyphenation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotHyphenateCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotHyphenateCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ShowEnvelope.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ShowEnvelope());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EvenAndOddHeaders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EvenAndOddHeaders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookFoldReversePrinting.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookFoldReversePrinting());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookFoldPrinting.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookFoldPrinting());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotUseMarginsForDrawingGridOrigin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotUseMarginsForDrawingGridOrigin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotShadeFormData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotShadeFormData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoPunctuationKerning.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoPunctuationKerning());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrintTwoOnOne.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrintTwoOnOne());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StrictFirstAndLastChars.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StrictFirstAndLastChars());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SavePreviewPicture.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SavePreviewPicture());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotValidateAgainstSchema.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotValidateAgainstSchema());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SaveInvalidXml.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SaveInvalidXml());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.IgnoreMixedContent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.IgnoreMixedContent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AlwaysShowPlaceholderText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AlwaysShowPlaceholderText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotDemarcateInvalidXml.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotDemarcateInvalidXml());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SaveXmlDataOnly.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SaveXmlDataOnly());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UseXsltWhenSaving.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UseXsltWhenSaving());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ShowXmlTags.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ShowXmlTags());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AlwaysMergeEmptyNamespace.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AlwaysMergeEmptyNamespace());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UpdateFieldsOnOpen.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UpdateFieldsOnOpen());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UICompatibleWith97To2003.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UICompatibleWith97To2003());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotIncludeSubdocsInStats.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotIncludeSubdocsInStats());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotAutoCompressPictures.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotAutoCompressPictures());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.ChartTrackingRefBased.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.ChartTrackingRefBased());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofState.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofState());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ReadModeInkLockDown.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ReadModeInkLockDown());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AttachedTemplate.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AttachedTemplate());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SaveThroughXslt.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SaveThroughXslt());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HeaderShapeDefaults.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HeaderShapeDefaults());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ShapeDefaults.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ShapeDefaults());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AttachedSchema.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AttachedSchema());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DecimalSymbol.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DecimalSymbol());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ListSeparator.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ListSeparator());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ClickAndTypeStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ClickAndTypeStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DefaultTableStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DefaultTableStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StylePaneFormatFilter.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StylePaneFormatFilter());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StylePaneSortMethods.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StylePaneSortMethods());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RevisionView.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RevisionView());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HyphenationZone.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HyphenationZone());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DrawingGridHorizontalSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DrawingGridHorizontalSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DrawingGridVerticalSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DrawingGridVerticalSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DrawingGridHorizontalOrigin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DrawingGridHorizontalOrigin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DrawingGridVerticalOrigin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DrawingGridVerticalOrigin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SummaryLength.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SummaryLength());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DisplayHorizontalDrawingGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DisplayHorizontalDrawingGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DisplayVerticalDrawingGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DisplayVerticalDrawingGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConsecutiveHyphenLimit.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConsecutiveHyphenLimit());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.View.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.View());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WriteProtection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WriteProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ActiveWritingStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ActiveWritingStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Zoom.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Zoom());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DefaultImageDpi.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DefaultImageDpi());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DocumentId.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DocumentId());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.DiscardImageEditingData.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.DiscardImageEditingData());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ConflictMode.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ConflictMode());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.PersistentDocumentId.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.PersistentDocumentId());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.WriteProtection.ElementType, 0, 1),
@@ -29896,18 +29896,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PixelsPerInch>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Divs>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Frameset>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OptimizeForBrowser>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RelyOnVML>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AllowPNG>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotRelyOnCSS>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotSaveAsSingleFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotOrganizeInFolder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotUseLongFileNames>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebPageEncoding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TargetScreenSize>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PixelsPerInch.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PixelsPerInch());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Divs.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Divs());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Frameset.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Frameset());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OptimizeForBrowser.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OptimizeForBrowser());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RelyOnVML.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RelyOnVML());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AllowPNG.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AllowPNG());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotRelyOnCSS.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotRelyOnCSS());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotSaveAsSingleFile.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotSaveAsSingleFile());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotOrganizeInFolder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotOrganizeInFolder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotUseLongFileNames.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotUseLongFileNames());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebPageEncoding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebPageEncoding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TargetScreenSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TargetScreenSize());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Frameset.ElementType, 0, 1),
@@ -30170,7 +30170,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Font>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Font.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Font());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Font.ElementType, 0, 0)
@@ -30269,10 +30269,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AbstractNum>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingIdMacAtCleanup>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingInstance>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingPictureBullet>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AbstractNum.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AbstractNum());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingIdMacAtCleanup.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingIdMacAtCleanup());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingInstance.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingInstance());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingPictureBullet.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingPictureBullet());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.NumberingPictureBullet.ElementType, 0, 0),
@@ -30373,9 +30373,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocDefaults>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LatentStyles>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Style>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocDefaults.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocDefaults());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LatentStyles.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LatentStyles());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Style.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Style());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.DocDefaults.ElementType, 0, 1),
@@ -30482,8 +30482,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocumentBackground>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Body>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocumentBackground.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocumentBackground());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Body.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Body());
             builder.AddElement<Document>()
                 .AddAttribute("w:conformance", a => a.Conformance);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -30615,8 +30615,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocumentBackground>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocParts>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocumentBackground.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocumentBackground());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocParts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocParts());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -30753,15 +30753,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableLook>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableIndentation>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableLook.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableLook());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableIndentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableIndentation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TableWidth.ElementType, 0, 1),
@@ -30966,22 +30966,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CellMerge>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GridSpan>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HorizontalMerge>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellFitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HideMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CellInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CellDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalMerge>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CellMerge.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CellMerge());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GridSpan.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GridSpan());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HorizontalMerge.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HorizontalMerge());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellFitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellFitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HideMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HideMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CellInsertion.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CellInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CellDeletion.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CellDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalMerge.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalMerge());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -31289,18 +31289,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GridBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GridAfter>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableRowHeight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DivId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CantSplit>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidthBeforeTableRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidthAfterTableRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GridBefore.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GridBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GridAfter.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GridAfter());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableRowHeight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableRowHeight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DivId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DivId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CantSplit.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CantSplit());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableHeader.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidthBeforeTableRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidthBeforeTableRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidthAfterTableRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidthAfterTableRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -31402,21 +31402,21 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDiVisual>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCaption>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableDescription>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableLook>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableOverlap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TablePositionProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableIndentation>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDiVisual.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDiVisual());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCaption.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCaption());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableDescription.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableDescription());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableLook.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableLook());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableOverlap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableOverlap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TablePositionProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TablePositionProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableIndentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableIndentation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -31797,26 +31797,26 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Columns>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnoteProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LineNumberType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FormProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoEndnote>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TitlePage>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDi>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GutterOnRight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageNumberType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PaperSource>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrinterSettingsReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SectionType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignmentOnPage>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Columns.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Columns());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnoteProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnoteProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LineNumberType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LineNumberType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FormProtection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FormProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoEndnote.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoEndnote());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TitlePage.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TitlePage());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDi.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDi());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GutterOnRight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GutterOnRight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageNumberType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageNumberType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PaperSource.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PaperSource());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrinterSettingsReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrinterSettingsReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SectionType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SectionType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignmentOnPage.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignmentOnPage());
             builder.AddElement<PreviousSectionProperties>()
                 .AddAttribute("w:rsidRPr", a => a.RsidRPr, aBuilder =>
                 {
@@ -32215,39 +32215,39 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OutlineLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Indentation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Justification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DivId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepNext>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidowControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kinsoku>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WordWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDi>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MirrorIndents>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Tabs>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OutlineLevel.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OutlineLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Indentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Indentation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Justification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Justification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DivId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DivId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepNext.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepNext());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidowControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidowControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kinsoku.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kinsoku());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WordWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WordWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDi.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDi());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MirrorIndents.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MirrorIndents());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Tabs.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Tabs());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -32840,56 +32840,56 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emphasis>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Highlight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kern>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Languages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Caps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SmallCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoubleStrike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emboss>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Imprint>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoProof>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Vanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightToLeftText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpecVanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Spacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CharacterScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.FillTextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Glow>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Ligatures>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NumberSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Properties3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Reflection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Scene3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.StylisticSets>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Border.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Color.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emphasis.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emphasis());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Highlight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Highlight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kern.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kern());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Languages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Languages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Bold.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Italic.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Caps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Caps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SmallCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SmallCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Strike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoubleStrike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoubleStrike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emboss.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emboss());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Imprint.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Imprint());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoProof.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoProof());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Vanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Vanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightToLeftText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightToLeftText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpecVanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpecVanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Spacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Spacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Position.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextEffect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CharacterScale.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CharacterScale());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.FillTextEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.FillTextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Glow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Glow());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Ligatures.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Ligatures());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NumberSpacing.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NumberSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Properties3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Properties3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Reflection.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Reflection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Scene3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Scene3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.StylisticSets.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.StylisticSets());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -33113,63 +33113,63 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emphasis>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Highlight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kern>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Languages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Caps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SmallCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoubleStrike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emboss>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Imprint>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoProof>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Vanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightToLeftText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpecVanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Spacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CharacterScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Inserted>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Deleted>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFrom>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveTo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.FillTextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Glow>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Ligatures>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NumberSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Properties3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Reflection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Scene3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.StylisticSets>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Border.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Color.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emphasis.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emphasis());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Highlight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Highlight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kern.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kern());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Languages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Languages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Bold.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Italic.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Caps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Caps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SmallCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SmallCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Strike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoubleStrike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoubleStrike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emboss.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emboss());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Imprint.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Imprint());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoProof.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoProof());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Vanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Vanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightToLeftText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightToLeftText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpecVanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpecVanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Spacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Spacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Position.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextEffect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CharacterScale.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CharacterScale());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Inserted.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Inserted());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Deleted.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Deleted());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFrom.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFrom());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveTo.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveTo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.FillTextEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.FillTextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Glow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Glow());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Ligatures.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Ligatures());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NumberSpacing.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NumberSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Properties3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Properties3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Reflection.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Reflection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Scene3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Scene3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.StylisticSets.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.StylisticSets());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -33853,64 +33853,64 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emphasis>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Highlight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kern>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Languages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Caps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SmallCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoubleStrike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emboss>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Imprint>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoProof>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Vanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightToLeftText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpecVanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphMarkRunPropertiesChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Spacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CharacterScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Inserted>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Deleted>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFrom>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveTo>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.FillTextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Glow>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Ligatures>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.NumberSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Properties3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Reflection>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Scene3D>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.StylisticSets>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Border.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Color.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emphasis.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emphasis());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Highlight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Highlight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kern.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kern());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Languages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Languages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Bold.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Italic.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Caps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Caps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SmallCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SmallCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Strike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoubleStrike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoubleStrike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emboss.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emboss());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Imprint.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Imprint());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoProof.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoProof());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Vanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Vanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightToLeftText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightToLeftText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpecVanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpecVanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphMarkRunPropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphMarkRunPropertiesChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Spacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Spacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Position.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextEffect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CharacterScale.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CharacterScale());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Inserted.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Inserted());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Deleted.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Deleted());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFrom.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFrom());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveTo.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveTo());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.FillTextEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.FillTextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Glow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Glow());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Ligatures.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Ligatures());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.NumberSpacing.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.NumberSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ContextualAlternatives());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Properties3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Properties3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Reflection.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Reflection());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Scene3D.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Scene3D());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.StylisticSets.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.StylisticSets());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.TextOutlineEffect());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -34230,29 +34230,29 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Columns>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnoteProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HeaderReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FooterReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LineNumberType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FormProtection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoEndnote>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TitlePage>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDi>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GutterOnRight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageNumberType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PaperSource>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrinterSettingsReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SectionPropertiesChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SectionType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignmentOnPage>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Columns.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Columns());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.FootnoteColumns());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnoteProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnoteProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HeaderReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HeaderReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FooterReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FooterReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LineNumberType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LineNumberType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FormProtection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FormProtection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoEndnote.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoEndnote());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TitlePage.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TitlePage());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDi.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDi());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GutterOnRight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GutterOnRight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageNumberType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageNumberType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PaperSource.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PaperSource());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrinterSettingsReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrinterSettingsReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SectionPropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SectionPropertiesChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SectionType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SectionType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignmentOnPage.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignmentOnPage());
             builder.AddElement<SectionProperties>()
                 .AddAttribute("w:rsidRPr", a => a.RsidRPr, aBuilder =>
                 {
@@ -34420,16 +34420,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DropDownListFormField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HelpText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FormFieldName>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StatusText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextInput>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EntryMacro>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ExitMacro>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Enabled>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CalculateOnExit>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CheckBox.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DropDownListFormField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DropDownListFormField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HelpText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HelpText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FormFieldName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FormFieldName());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StatusText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StatusText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextInput.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextInput());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EntryMacro.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EntryMacro());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ExitMacro.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ExitMacro());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Enabled.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Enabled());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CalculateOnExit.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CalculateOnExit());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.FormFieldName.ElementType, 1, 1),
@@ -34788,10 +34788,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FormFieldSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutomaticallySizeFormField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DefaultCheckBoxFormFieldState>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Checked>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FormFieldSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FormFieldSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutomaticallySizeFormField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutomaticallySizeFormField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DefaultCheckBoxFormFieldState.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DefaultCheckBoxFormFieldState());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Checked.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Checked());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -34864,9 +34864,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DropDownListSelection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ListEntryFormField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DefaultDropDownListItemIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DropDownListSelection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DropDownListSelection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ListEntryFormField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ListEntryFormField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DefaultDropDownListItemIndex.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DefaultDropDownListItemIndex());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.DropDownListSelection.ElementType, 0, 1),
@@ -34962,10 +34962,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxFormFieldType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MaxLength>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DefaultTextBoxFormFieldString>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Format>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxFormFieldType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxFormFieldType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MaxLength.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MaxLength());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DefaultTextBoxFormFieldString.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DefaultTextBoxFormFieldString());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Format.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Format());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TextBoxFormFieldType.ElementType, 0, 1),
@@ -35543,7 +35543,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousSectionProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousSectionProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousSectionProperties());
             builder.AddElement<SectionPropertiesChange>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -35697,7 +35697,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousParagraphMarkRunProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousParagraphMarkRunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousParagraphMarkRunProperties());
             builder.AddElement<ParagraphMarkRunPropertiesChange>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -35799,7 +35799,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MatchSource>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MatchSource.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MatchSource());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.MatchSource.ElementType, 0, 1)
@@ -36027,12 +36027,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideTextFontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideBaseTextSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideRaise>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LanguageId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Dirty>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RubyAlign>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideTextFontSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideTextFontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideBaseTextSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideBaseTextSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideRaise.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PhoneticGuideRaise());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LanguageId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LanguageId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Dirty.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Dirty());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RubyAlign.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RubyAlign());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.RubyAlign.ElementType, 1, 1),
@@ -36713,63 +36713,63 @@ protected RubyContentType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
         }
     }
 
@@ -37005,36 +37005,36 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DataBinding>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.DataBinding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentEquation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentPicture>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentRichText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentCitation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentBibliography>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.EntityPickerEmpty>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSectionItem>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Lock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ShowingPlaceholder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TemporarySdt>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.WebExtensionLinked>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.WebExtensionCreated>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtPlaceholder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentComboBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentDate>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentDocPartObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentDocPartList>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentDropDownList>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtContentText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtAlias>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Tag>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.SdtContentCheckBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.Appearance>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSection>();
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.Color.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DataBinding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DataBinding());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.DataBinding.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.DataBinding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentEquation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentEquation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentPicture.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentPicture());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentRichText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentRichText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentCitation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentCitation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentGroup.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentGroup());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentBibliography.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentBibliography());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.EntityPickerEmpty.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.EntityPickerEmpty());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSectionItem.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSectionItem());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Lock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Lock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ShowingPlaceholder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ShowingPlaceholder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TemporarySdt.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TemporarySdt());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.WebExtensionLinked.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.WebExtensionLinked());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.WebExtensionCreated.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.WebExtensionCreated());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtPlaceholder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtPlaceholder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentComboBox.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentComboBox());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentDate.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentDate());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentDocPartObject.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentDocPartObject());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentDocPartList.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentDocPartList());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentDropDownList.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentDropDownList());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtContentText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtContentText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtAlias.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtAlias());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Tag.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Tag());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.SdtContentCheckBox.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.SdtContentCheckBox());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.Appearance.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.Appearance());
+            builder.AddChild(DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSection.ElementType, static () => new DocumentFormat.OpenXml.Office2013.Word.SdtRepeatedSection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, 0, 1),
@@ -37134,7 +37134,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.RunProperties.ElementType, 0, 1)
@@ -37232,40 +37232,40 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 0, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -37467,66 +37467,66 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hyperlink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleField>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalOverride());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BidirectionalEmbedding());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hyperlink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hyperlink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SubDocumentReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleField.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleField());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -37803,63 +37803,63 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Math.Accent>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Bar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.BorderBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Box>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Delimiter>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.EquationArray>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Fraction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.MathFunction>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.GroupChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.LimitUpper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Nary>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.OfficeMath>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Phantom>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Radical>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.PreSubSuper>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Subscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.SubSuperscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Math.Superscript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Run>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Math.Accent.ElementType, static () => new DocumentFormat.OpenXml.Math.Accent());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Bar.ElementType, static () => new DocumentFormat.OpenXml.Math.Bar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.BorderBox.ElementType, static () => new DocumentFormat.OpenXml.Math.BorderBox());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Box.ElementType, static () => new DocumentFormat.OpenXml.Math.Box());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Delimiter.ElementType, static () => new DocumentFormat.OpenXml.Math.Delimiter());
+            builder.AddChild(DocumentFormat.OpenXml.Math.EquationArray.ElementType, static () => new DocumentFormat.OpenXml.Math.EquationArray());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Fraction.ElementType, static () => new DocumentFormat.OpenXml.Math.Fraction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.MathFunction.ElementType, static () => new DocumentFormat.OpenXml.Math.MathFunction());
+            builder.AddChild(DocumentFormat.OpenXml.Math.GroupChar.ElementType, static () => new DocumentFormat.OpenXml.Math.GroupChar());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitLower.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitLower());
+            builder.AddChild(DocumentFormat.OpenXml.Math.LimitUpper.ElementType, static () => new DocumentFormat.OpenXml.Math.LimitUpper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Matrix.ElementType, static () => new DocumentFormat.OpenXml.Math.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Nary.ElementType, static () => new DocumentFormat.OpenXml.Math.Nary());
+            builder.AddChild(DocumentFormat.OpenXml.Math.OfficeMath.ElementType, static () => new DocumentFormat.OpenXml.Math.OfficeMath());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Math.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Phantom.ElementType, static () => new DocumentFormat.OpenXml.Math.Phantom());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Run.ElementType, static () => new DocumentFormat.OpenXml.Math.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Radical.ElementType, static () => new DocumentFormat.OpenXml.Math.Radical());
+            builder.AddChild(DocumentFormat.OpenXml.Math.PreSubSuper.ElementType, static () => new DocumentFormat.OpenXml.Math.PreSubSuper());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Subscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Subscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.SubSuperscript.ElementType, static () => new DocumentFormat.OpenXml.Math.SubSuperscript());
+            builder.AddChild(DocumentFormat.OpenXml.Math.Superscript.ElementType, static () => new DocumentFormat.OpenXml.Math.Superscript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HyperlinkRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Run.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Run());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRunRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SimpleFieldRuby());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 0, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -38075,39 +38075,39 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 0, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -38275,39 +38275,39 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Group, 0, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -38444,8 +38444,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlPlaceholder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlAttribute>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlPlaceholder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlPlaceholder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlAttribute.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlAttribute());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.CustomXmlPlaceholder.ElementType, 0, 1),
@@ -38670,7 +38670,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousTableGrid>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousTableGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousTableGrid());
             builder.AddElement<TableGridChange>()
                 .AddAttribute("w:id", a => a.Id, aBuilder =>
                 {
@@ -38815,7 +38815,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousTableCellProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousTableCellProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousTableCellProperties());
             builder.AddElement<TableCellPropertiesChange>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -38933,23 +38933,23 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CellMerge>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GridSpan>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HorizontalMerge>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellFitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HideMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellPropertiesChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CellInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CellDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalMerge>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CellMerge.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CellMerge());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GridSpan.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GridSpan());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HorizontalMerge.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HorizontalMerge());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellFitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellFitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HideMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HideMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellPropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellPropertiesChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CellInsertion.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CellInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CellDeletion.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CellDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalMerge.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalMerge());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -39305,7 +39305,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousTableProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousTableProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousTableProperties());
             builder.AddElement<TablePropertiesChange>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -39459,7 +39459,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousTablePropertyExceptions>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousTablePropertyExceptions.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousTablePropertyExceptions());
             builder.AddElement<TablePropertyExceptionsChange>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -39576,22 +39576,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDiVisual>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCaption>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableDescription>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableLook>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableOverlap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TablePositionProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TablePropertiesChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableIndentation>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDiVisual.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDiVisual());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCaption.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCaption());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableDescription.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableDescription());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableLook.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableLook());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableOverlap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableOverlap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TablePositionProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TablePositionProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TablePropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TablePropertiesChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableIndentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableIndentation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -39922,8 +39922,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableGridChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GridColumn>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableGridChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableGridChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GridColumn.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GridColumn());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -40419,9 +40419,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UniqueTag>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Active>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ColumnIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UniqueTag.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UniqueTag());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Active.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Active());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ColumnIndex.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ColumnIndex());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Active.ElementType, 0, 1),
@@ -40629,12 +40629,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LanguageId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MailMergeFieldType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DynamicAddress>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Name>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MappedName>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ColumnIndex>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LanguageId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LanguageId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MailMergeFieldType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MailMergeFieldType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DynamicAddress.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DynamicAddress());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Name.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Name());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MappedName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MappedName());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ColumnIndex.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ColumnIndex());
             builder.Particle = new CompositeParticle.Builder(ParticleType.All, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.MailMergeFieldType.ElementType, 0, 1),
@@ -40933,14 +40933,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MailMergeSource>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FieldMapData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FirstRowHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SourceReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RecipientDataReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UdlConnectionString>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DataSourceTableName>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ColumnDelimiter>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MailMergeSource.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MailMergeSource());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FieldMapData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FieldMapData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FirstRowHeader.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FirstRowHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SourceReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SourceReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RecipientDataReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RecipientDataReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UdlConnectionString.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UdlConnectionString());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DataSourceTableName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DataSourceTableName());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ColumnDelimiter.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ColumnDelimiter());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.UdlConnectionString.ElementType, 0, 1),
@@ -41355,40 +41355,40 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emphasis>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kern>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Languages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Caps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SmallCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoubleStrike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emboss>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Imprint>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoProof>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Vanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpecVanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Spacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CharacterScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Border.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Color.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emphasis.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emphasis());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kern.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kern());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Languages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Languages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Bold.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Italic.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Caps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Caps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SmallCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SmallCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Strike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoubleStrike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoubleStrike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emboss.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emboss());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Imprint.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Imprint());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoProof.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoProof());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Vanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Vanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpecVanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpecVanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Spacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Spacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Position.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextEffect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CharacterScale.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CharacterScale());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -41981,36 +41981,36 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OutlineLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Indentation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Justification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepNext>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidowControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kinsoku>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WordWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDi>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MirrorIndents>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Tabs>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OutlineLevel.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OutlineLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Indentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Indentation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Justification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Justification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepNext.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepNext());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidowControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidowControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kinsoku.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kinsoku());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WordWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WordWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDi.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDi());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MirrorIndents.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MirrorIndents());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Tabs.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Tabs());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -42500,7 +42500,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunPropertiesBaseStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunPropertiesBaseStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunPropertiesBaseStyle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.RunPropertiesBaseStyle.ElementType, 0, 1)
@@ -42578,7 +42578,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesBaseStyle>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesBaseStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesBaseStyle());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesBaseStyle.ElementType, 0, 1)
@@ -43041,10 +43041,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FlatBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Width>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Color.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FlatBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FlatBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Width.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Width());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Width.ElementType, 0, 1),
@@ -43216,11 +43216,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Frame>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Frameset>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FramesetSplitbar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameSize>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Frame.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Frame());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Frameset.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Frameset());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FramesetSplitbar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FramesetSplitbar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameSize());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.FrameSize.ElementType, 0, 1),
@@ -43341,14 +43341,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ScrollbarVisibility>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoResizeAllowed>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LinkedToFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MarginWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MarginHeight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SourceFileReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameName>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ScrollbarVisibility.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ScrollbarVisibility());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoResizeAllowed.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoResizeAllowed());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LinkedToFile.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LinkedToFile());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MarginWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MarginWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MarginHeight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MarginHeight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SourceFileReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SourceFileReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameName());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.FrameSize.ElementType, 0, 1),
@@ -43798,37 +43798,37 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OutlineLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Indentation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Justification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepNext>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidowControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kinsoku>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WordWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDi>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MirrorIndents>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Tabs>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OutlineLevel.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OutlineLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Indentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Indentation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Justification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Justification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepNext.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepNext());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidowControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidowControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kinsoku.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kinsoku());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WordWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WordWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDi.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDi());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MirrorIndents.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MirrorIndents());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Tabs.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Tabs());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -44373,42 +44373,42 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emphasis>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kern>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Languages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Caps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SmallCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoubleStrike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emboss>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Imprint>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoProof>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Vanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightToLeftText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpecVanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Spacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CharacterScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Border.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Color.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emphasis.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emphasis());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kern.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kern());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Languages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Languages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Bold.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Italic.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Caps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Caps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SmallCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SmallCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Strike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoubleStrike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoubleStrike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emboss.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emboss());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Imprint.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Imprint());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoProof.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoProof());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Vanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Vanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightToLeftText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightToLeftText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpecVanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpecVanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Spacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Spacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Position.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextEffect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CharacterScale.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CharacterScale());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -45098,18 +45098,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LevelRestart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LevelPictureBulletId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LevelJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LevelSuffix>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LevelText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LegacyNumbering>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StartNumberingValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.IsLegalNumberingStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingSymbolRunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleIdInLevel>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LevelRestart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LevelRestart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LevelPictureBulletId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LevelPictureBulletId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LevelJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LevelJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LevelSuffix.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LevelSuffix());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LevelText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LevelText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LegacyNumbering.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LegacyNumbering());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StartNumberingValue.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StartNumberingValue());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.IsLegalNumberingStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.IsLegalNumberingStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingSymbolRunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingSymbolRunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleIdInLevel.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleIdInLevel());
             builder.AddElement<Level>()
                 .AddAttribute("w:ilvl", a => a.LevelIndex, aBuilder =>
                 {
@@ -45365,8 +45365,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Drawing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PictureBulletBase>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Drawing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Drawing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PictureBulletBase.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PictureBulletBase());
             builder.AddElement<NumberingPictureBullet>()
                 .AddAttribute("w:numPicBulletId", a => a.NumberingPictureBulletId, aBuilder =>
                 {
@@ -45486,13 +45486,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Nsid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TemplateCode>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Level>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MultiLevelType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AbstractNumDefinitionName>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleLink>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingStyleLink>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Nsid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Nsid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TemplateCode.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TemplateCode());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Level.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Level());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MultiLevelType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MultiLevelType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AbstractNumDefinitionName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AbstractNumDefinitionName());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleLink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleLink());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingStyleLink.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingStyleLink());
             builder.AddElement<AbstractNum>()
                 .AddAttribute("w:abstractNumId", a => a.AbstractNumberId, aBuilder =>
                 {
@@ -45675,8 +45675,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AbstractNumId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LevelOverride>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AbstractNumId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AbstractNumId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LevelOverride.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LevelOverride());
             builder.AddElement<NumberingInstance>()
                 .AddAttribute("w:numId", a => a.NumberID, aBuilder =>
                 {
@@ -45792,37 +45792,37 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OutlineLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Indentation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Justification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepNext>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidowControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kinsoku>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WordWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDi>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MirrorIndents>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Tabs>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OutlineLevel.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OutlineLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Indentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Indentation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Justification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Justification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepNext.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepNext());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidowControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidowControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kinsoku.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kinsoku());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WordWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WordWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDi.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDi());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MirrorIndents.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MirrorIndents());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Tabs.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Tabs());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -46343,12 +46343,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableIndentation>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableIndentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableIndentation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -46512,11 +46512,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CantSplit>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CantSplit.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CantSplit());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableHeader.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 0)
@@ -46595,11 +46595,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -46884,41 +46884,41 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Border>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Color>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emphasis>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FitText>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunFonts>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kern>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Languages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Bold>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Italic>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Caps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SmallCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Strike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoubleStrike>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Outline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shadow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Emboss>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Imprint>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoProof>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Vanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WebHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpecVanish>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunPropertiesChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Spacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Position>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextEffect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CharacterScale>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Underline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Border.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Border());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Color.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Color());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EastAsianLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emphasis.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emphasis());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FitText.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FitText());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunFonts.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunFonts());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kern.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kern());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSizeComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Languages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Languages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Bold.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Bold());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BoldComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Italic.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Italic());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ItalicComplexScript());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Caps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Caps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SmallCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SmallCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Strike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Strike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoubleStrike.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoubleStrike());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Outline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Outline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shadow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Emboss.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Emboss());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Imprint.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Imprint());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoProof.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoProof());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Vanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Vanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WebHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WebHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpecVanish.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpecVanish());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunPropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunPropertiesChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Spacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Spacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Position.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Position());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextEffect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextEffect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CharacterScale.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CharacterScale());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Underline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Underline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.VerticalTextAlignment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -47515,14 +47515,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableIndentation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyleRowBandSize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyleColumnBandSize>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableIndentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableIndentation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyleRowBandSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyleRowBandSize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyleColumnBandSize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyleColumnBandSize());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -47719,10 +47719,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMargin>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMargin.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMargin());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellVerticalAlignment());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 0, 1)
@@ -47871,11 +47871,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunPropertiesBaseStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableCellProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableRowProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunPropertiesBaseStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunPropertiesBaseStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableCellProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableCellProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableRowProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableRowProperties());
             builder.AddElement<TableStyleProperties>()
                 .AddAttribute("w:type", a => a.Type, aBuilder =>
                 {
@@ -48136,8 +48136,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RunPropertiesDefault>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesDefault.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RunPropertiesDefault.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RunPropertiesDefault());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.RunPropertiesDefault.ElementType, 0, 1),
@@ -48307,7 +48307,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LatentStyleExceptionInfo>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LatentStyleExceptionInfo.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LatentStyleExceptionInfo());
             builder.AddElement<LatentStyles>()
                 .AddAttribute("w:defLockedState", a => a.DefaultLockedState)
                 .AddAttribute("w:defUIPriority", a => a.DefaultUiPriority, aBuilder =>
@@ -48455,28 +48455,28 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Rsid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoRedefine>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SemiHidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UnhideWhenUsed>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrimaryStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Locked>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Personal>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PersonalCompose>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PersonalReply>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleParagraphProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleRunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Aliases>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BasedOn>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NextParagraphStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LinkedStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleName>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleTableProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyleProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleTableCellProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableRowProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UIPriority>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Rsid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Rsid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoRedefine.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoRedefine());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SemiHidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SemiHidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UnhideWhenUsed.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UnhideWhenUsed());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrimaryStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrimaryStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Locked.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Locked());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Personal.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Personal());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PersonalCompose.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PersonalCompose());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PersonalReply.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PersonalReply());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleParagraphProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleParagraphProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleRunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleRunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Aliases.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Aliases());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BasedOn.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BasedOn());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NextParagraphStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NextParagraphStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LinkedStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LinkedStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleName());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleTableProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleTableProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyleProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyleProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleTableCellProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleTableCellProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableRowProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableStyleConditionalFormattingTableRowProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UIPriority.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UIPriority());
             builder.AddElement<Style>()
                 .AddAttribute("w:type", a => a.Type)
                 .AddAttribute("w:styleId", a => a.StyleId, aBuilder =>
@@ -48867,17 +48867,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontCharSet>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontFamily>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EmbedRegularFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EmbedBoldFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EmbedItalicFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EmbedBoldItalicFont>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FontSignature>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NotTrueType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Panose1Number>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Pitch>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltName>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontCharSet.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontCharSet());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontFamily.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontFamily());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EmbedRegularFont.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EmbedRegularFont());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EmbedBoldFont.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EmbedBoldFont());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EmbedItalicFont.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EmbedItalicFont());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EmbedBoldItalicFont.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EmbedBoldItalicFont());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FontSignature.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FontSignature());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NotTrueType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NotTrueType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Panose1Number.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Panose1Number());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Pitch.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Pitch());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltName());
             builder.AddElement<Font>()
                 .AddAttribute("w:name", a => a.Name, aBuilder =>
                 {
@@ -49273,10 +49273,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LeftBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BottomBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightBorder>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LeftBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LeftBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BottomBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BottomBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightBorder());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.TopBorder.ElementType, 0, 1),
@@ -49523,7 +49523,7 @@ protected DivsType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Div>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Div.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Div());
         }
     }
 
@@ -49601,14 +49601,14 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DivBorder>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DivsChild>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BlockQuote>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BodyDiv>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LeftMarginDiv>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RightMarginDiv>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopMarginDiv>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BottomMarginDiv>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DivBorder.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DivBorder());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DivsChild.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DivsChild());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BlockQuote.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BlockQuote());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BodyDiv.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BodyDiv());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LeftMarginDiv.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LeftMarginDiv());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RightMarginDiv.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RightMarginDiv());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopMarginDiv.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopMarginDiv());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BottomMarginDiv.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BottomMarginDiv());
             builder.AddElement<Div>()
                 .AddAttribute("w:id", a => a.Id, aBuilder =>
                 {
@@ -49858,18 +49858,18 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunk>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunk.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunk());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
             builder.AddElement<Comment>()
                 .AddAttribute("w:initials", a => a.Initials, aBuilder =>
                 {
@@ -50480,41 +50480,41 @@ public IntegerValue? Id
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunk>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunk.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunk());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
             builder.AddElement<FootnoteEndnoteType>()
                 .AddAttribute("w:type", a => a.Type)
                 .AddAttribute("w:id", a => a.Id, aBuilder =>
@@ -50924,7 +50924,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoCaption>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoCaption.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoCaption());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.AutoCaption.ElementType, 1, 0)
@@ -51041,7 +51041,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Background>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Background.ElementType, static () => new DocumentFormat.OpenXml.Vml.Background());
             builder.AddElement<DocumentBackground>()
                 .AddAttribute("w:color", a => a.Color, aBuilder =>
                 {
@@ -51137,7 +51137,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.DocPart.ElementType, 0, 0, version: FileFormatVersions.Office2007),
@@ -51267,8 +51267,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Gallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Name>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Gallery.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Gallery());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Name.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Name());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Name.ElementType, 1, 1),
@@ -51373,7 +51373,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartType>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartType());
             builder.AddElement<DocPartTypes>()
                 .AddAttribute("w:all", a => a.All);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
@@ -51440,7 +51440,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Behavior>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Behavior.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Behavior());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Behavior.ElementType, 1, 0)
@@ -51560,13 +51560,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Behaviors>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Category>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartName>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartTypes>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StyleId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Description>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Behaviors.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Behaviors());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Category.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Category());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartName());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartTypes.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartTypes());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StyleId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StyleId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Description.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Description());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.DocPartName.ElementType, 0, 1),
@@ -52162,42 +52162,42 @@ protected BodyType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AltChunk>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContentPart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Paragraph>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermEnd>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PermStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ProofError>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.InsertedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DeletedRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveFromRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MoveToRun>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtBlock>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SectionProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Table>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AltChunk.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AltChunk());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContentPart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContentPart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BookmarkEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CommentRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Paragraph.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Paragraph());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermEnd.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermEnd());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PermStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PermStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ProofError.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ProofError());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.InsertedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.InsertedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DeletedRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DeletedRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveFromRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveFromRun());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MoveToRun.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MoveToRun());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.RunConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtBlock.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtBlock());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SectionProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SectionProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Table.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Table());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlInsRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlDelRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveFromRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CustomXmlMoveToRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictInsertionRangeStart());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.CustomXmlConflictDeletionRangeStart());
         }
     }
 
@@ -52256,8 +52256,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartBody>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartBody.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartBody());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartProperties());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.DocPartProperties.ElementType, 0, 1),
@@ -52563,16 +52563,16 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableLook>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TablePropertyExceptionsChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableIndentation>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellMarginDefault());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableLook.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableLook());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TablePropertyExceptionsChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TablePropertyExceptionsChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableIndentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableIndentation());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -52798,23 +52798,23 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GridBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GridAfter>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableRowHeight>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DivId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Hidden>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CantSplit>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidthBeforeTableRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidthAfterTableRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Inserted>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Deleted>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TableRowPropertiesChange>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GridBefore.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GridBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GridAfter.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GridAfter());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableRowHeight.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableRowHeight());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DivId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DivId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Hidden.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Hidden());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CantSplit.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CantSplit());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableHeader.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidthBeforeTableRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidthBeforeTableRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidthAfterTableRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidthAfterTableRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableCellSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Inserted.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Inserted());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Deleted.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Deleted());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ConflictInsertion());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Word.ConflictDeletion());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TableRowPropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TableRowPropertiesChange());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
@@ -52971,7 +52971,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PreviousTableRowProperties>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PreviousTableRowProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PreviousTableRowProperties());
             builder.AddElement<TableRowPropertiesChange>()
                 .AddAttribute("w:author", a => a.Author, aBuilder =>
                 {
@@ -53108,42 +53108,42 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OutlineLevel>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FrameProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Indentation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Justification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DivId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepNext>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.KeepLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WidowControl>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Kinsoku>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WordWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BiDi>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SnapToGrid>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MirrorIndents>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphMarkRunProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesChange>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SectionProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Shading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Tabs>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TextDirection>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConditionalFormatStyle());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OutlineLevel.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OutlineLevel());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FrameProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FrameProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Indentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Indentation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Justification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Justification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DivId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DivId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepNext.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepNext());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.KeepLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.KeepLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PageBreakBefore());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WidowControl.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WidowControl());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressLineNumbers());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressAutoHyphens());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Kinsoku.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Kinsoku());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WordWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WordWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.OverflowPunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TopLinePunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDE());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceDN());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BiDi.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BiDi());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AdjustRightIndent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SnapToGrid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SnapToGrid());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ContextualSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MirrorIndents.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MirrorIndents());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressOverlap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphMarkRunProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphMarkRunProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesChange.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphPropertiesChange());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SectionProperties.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SectionProperties());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Shading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Shading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpacingBetweenLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ParagraphStyleId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Tabs.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Tabs());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextBoxTightWrap());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TextDirection.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TextDirection());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -53819,7 +53819,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GridColumn>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GridColumn.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GridColumn());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.GridColumn.ElementType, 0, 0)
@@ -54168,7 +54168,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartReference>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartReference());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.DocPartReference.ElementType, 1, 1)
@@ -54338,7 +54338,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ListItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ListItem.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ListItem());
             builder.AddElement<SdtContentComboBox>()
                 .AddAttribute("w:lastValue", a => a.LastValue);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -54421,10 +54421,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Calendar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LanguageId>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SdtDateMappingType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DateFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Calendar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Calendar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LanguageId.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LanguageId());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SdtDateMappingType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SdtDateMappingType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DateFormat.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DateFormat());
             builder.AddElement<SdtContentDate>()
                 .AddAttribute("w:fullDate", a => a.FullDate);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -54683,9 +54683,9 @@ protected SdtDocPartType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartUnique>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartGallery>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocPartCategory>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartUnique.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartUnique());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartGallery.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartGallery());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocPartCategory.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocPartCategory());
         }
 
         /// <summary>
@@ -54795,7 +54795,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ListItem>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ListItem.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ListItem());
             builder.AddElement<SdtContentDropDownList>()
                 .AddAttribute("w:lastValue", a => a.LastValue);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -55925,22 +55925,22 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ActiveRecord>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CheckErrors>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DataType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Destination>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MainDocumentType>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DataSourceObject>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LinkToQuery>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressBlankLines>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MailAsAttachment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ViewMergedData>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DataSourceReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.HeaderSource>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConnectString>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Query>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AddressFieldName>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MailSubject>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ActiveRecord.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ActiveRecord());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CheckErrors.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CheckErrors());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DataType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DataType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Destination.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Destination());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MainDocumentType.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MainDocumentType());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DataSourceObject.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DataSourceObject());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LinkToQuery.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LinkToQuery());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressBlankLines.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressBlankLines());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MailAsAttachment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MailAsAttachment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ViewMergedData.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ViewMergedData());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DataSourceReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DataSourceReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.HeaderSource.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.HeaderSource());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConnectString.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConnectString());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Query.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Query());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AddressFieldName.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AddressFieldName());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MailSubject.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MailSubject());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.MainDocumentType.ElementType, 0, 1),
@@ -57329,8 +57329,8 @@ protected ShapeDefaultsType(string outerXml) : base(outerXml)
         internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ShapeDefaults>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ShapeLayout>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ShapeDefaults.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ShapeDefaults());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ShapeLayout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ShapeLayout());
         }
     }
 
@@ -57392,11 +57392,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteSpecialReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnotePosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingRestart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteSpecialReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteSpecialReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnotePosition.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnotePosition());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingRestart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingRestart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -57533,11 +57533,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnotePosition>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingStart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.EndnoteSpecialReference>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NumberingRestart>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnotePosition.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnotePosition());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingStart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingStart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.EndnoteSpecialReference.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.EndnoteSpecialReference());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingFormat.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingFormat());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NumberingRestart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NumberingRestart());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -57735,72 +57735,72 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CompatibilitySetting>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UseSingleBorderForContiguousCells>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WordPerfectJustification>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoTabHangIndent>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoLeading>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpaceForUnderline>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoColumnBalance>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.BalanceSingleByteDoubleByteWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoExtraLineSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotLeaveBackslashAlone>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UnderlineTrailingSpaces>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotExpandShiftReturn>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SpacingInWholePoints>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LineWrapLikeWord6>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrintBodyTextBeforeHeader>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.PrintColorBlackWhite>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WordPerfectSpaceWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ShowBreaksInFrames>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SubFontBySize>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressBottomSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressTopSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressSpacingAtTopOfPage>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressTopSpacingWordPerfect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SuppressSpacingBeforeAfterPageBreak>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SwapBordersFacingPages>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ConvertMailMergeEscape>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.TruncateFontHeightsLikeWordPerfect>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.MacWordSmallCaps>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UsePrinterMetrics>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressParagraphBorders>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.WrapTrailSpaces>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.FootnoteLayoutLikeWord8>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ShapeLayoutLikeWord8>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AlignTablesRowByRow>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ForgetLastTabAlignment>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AdjustLineHeightInTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoSpaceLikeWord95>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.NoSpaceRaiseLower>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotUseHTMLParagraphAutoSpacing>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LayoutRawTableWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.LayoutTableRowsApart>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UseWord97LineBreakRules>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotBreakWrappedTables>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotSnapToGridInCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SelectFieldWithFirstOrLastChar>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.ApplyBreakingRules>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotWrapTextWithPunctuation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotUseEastAsianBreakRules>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UseWord2002TableStyleRules>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.GrowAutofit>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UseFarEastLayout>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UseNormalStyleForList>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotUseIndentAsNumberingTabStop>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UseAltKinsokuLineBreakRules>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AllowSpaceOfSameStyleInTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressIndentation>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotAutofitConstrainedTables>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutofitToFirstFixedWidthCell>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UnderlineTabInNumberingList>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DisplayHangulFixedWidth>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.SplitPageBreakAndParagraphMark>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotVerticallyAlignCellWithShape>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotBreakConstrainedForcedTable>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DoNotVerticallyAlignInTextBox>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.UseAnsiKerningPairs>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.CachedColumnBalance>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CompatibilitySetting.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CompatibilitySetting());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UseSingleBorderForContiguousCells.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UseSingleBorderForContiguousCells());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WordPerfectJustification.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WordPerfectJustification());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoTabHangIndent.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoTabHangIndent());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoLeading.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoLeading());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpaceForUnderline.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpaceForUnderline());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoColumnBalance.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoColumnBalance());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.BalanceSingleByteDoubleByteWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.BalanceSingleByteDoubleByteWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoExtraLineSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoExtraLineSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotLeaveBackslashAlone.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotLeaveBackslashAlone());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UnderlineTrailingSpaces.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UnderlineTrailingSpaces());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotExpandShiftReturn.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotExpandShiftReturn());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SpacingInWholePoints.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SpacingInWholePoints());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LineWrapLikeWord6.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LineWrapLikeWord6());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrintBodyTextBeforeHeader.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrintBodyTextBeforeHeader());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.PrintColorBlackWhite.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.PrintColorBlackWhite());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WordPerfectSpaceWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WordPerfectSpaceWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ShowBreaksInFrames.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ShowBreaksInFrames());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SubFontBySize.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SubFontBySize());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressBottomSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressBottomSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressTopSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressTopSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressSpacingAtTopOfPage.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressSpacingAtTopOfPage());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressTopSpacingWordPerfect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressTopSpacingWordPerfect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SuppressSpacingBeforeAfterPageBreak.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SuppressSpacingBeforeAfterPageBreak());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SwapBordersFacingPages.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SwapBordersFacingPages());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ConvertMailMergeEscape.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ConvertMailMergeEscape());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.TruncateFontHeightsLikeWordPerfect.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.TruncateFontHeightsLikeWordPerfect());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.MacWordSmallCaps.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.MacWordSmallCaps());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UsePrinterMetrics.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UsePrinterMetrics());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressParagraphBorders.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressParagraphBorders());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.WrapTrailSpaces.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.WrapTrailSpaces());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.FootnoteLayoutLikeWord8.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.FootnoteLayoutLikeWord8());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ShapeLayoutLikeWord8.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ShapeLayoutLikeWord8());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AlignTablesRowByRow.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AlignTablesRowByRow());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ForgetLastTabAlignment.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ForgetLastTabAlignment());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AdjustLineHeightInTable.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AdjustLineHeightInTable());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoSpaceLikeWord95.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoSpaceLikeWord95());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.NoSpaceRaiseLower.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.NoSpaceRaiseLower());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotUseHTMLParagraphAutoSpacing.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotUseHTMLParagraphAutoSpacing());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LayoutRawTableWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LayoutRawTableWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.LayoutTableRowsApart.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.LayoutTableRowsApart());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UseWord97LineBreakRules.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UseWord97LineBreakRules());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotBreakWrappedTables.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotBreakWrappedTables());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotSnapToGridInCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotSnapToGridInCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SelectFieldWithFirstOrLastChar.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SelectFieldWithFirstOrLastChar());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.ApplyBreakingRules.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.ApplyBreakingRules());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotWrapTextWithPunctuation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotWrapTextWithPunctuation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotUseEastAsianBreakRules.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotUseEastAsianBreakRules());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UseWord2002TableStyleRules.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UseWord2002TableStyleRules());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.GrowAutofit.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.GrowAutofit());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UseFarEastLayout.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UseFarEastLayout());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UseNormalStyleForList.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UseNormalStyleForList());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotUseIndentAsNumberingTabStop.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotUseIndentAsNumberingTabStop());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UseAltKinsokuLineBreakRules.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UseAltKinsokuLineBreakRules());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AllowSpaceOfSameStyleInTable.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AllowSpaceOfSameStyleInTable());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressIndentation.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotSuppressIndentation());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotAutofitConstrainedTables.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotAutofitConstrainedTables());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutofitToFirstFixedWidthCell.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutofitToFirstFixedWidthCell());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UnderlineTabInNumberingList.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UnderlineTabInNumberingList());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DisplayHangulFixedWidth.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DisplayHangulFixedWidth());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.SplitPageBreakAndParagraphMark.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.SplitPageBreakAndParagraphMark());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotVerticallyAlignCellWithShape.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotVerticallyAlignCellWithShape());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotBreakConstrainedForcedTable.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotBreakConstrainedForcedTable());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DoNotVerticallyAlignInTextBox.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DoNotVerticallyAlignInTextBox());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.UseAnsiKerningPairs.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.UseAnsiKerningPairs());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.CachedColumnBalance.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.CachedColumnBalance());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.UseSingleBorderForContiguousCells.ElementType, 0, 1),
@@ -58775,7 +58775,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.DocumentVariable>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.DocumentVariable.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.DocumentVariable());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.DocumentVariable.ElementType, 0, 0)
@@ -58841,8 +58841,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.RsidRoot>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Rsid>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.RsidRoot.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.RsidRoot());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Rsid.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Rsid());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.RsidRoot.ElementType, 0, 1),
@@ -59121,8 +59121,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.AutoCaptions>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Caption>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.AutoCaptions.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.AutoCaptions());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Caption.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Caption());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.Wordprocessing.Caption.ElementType, 1, 0),
@@ -59351,15 +59351,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.ImageFile>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Line>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Oval>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.PolyLine>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Rectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.RoundRectangle>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shape>();
-            builder.AddChild<DocumentFormat.OpenXml.Vml.Shapetype>();
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Group.ElementType, static () => new DocumentFormat.OpenXml.Vml.Group());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.ImageFile.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageFile());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Line.ElementType, static () => new DocumentFormat.OpenXml.Vml.Line());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Oval.ElementType, static () => new DocumentFormat.OpenXml.Vml.Oval());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.PolyLine.ElementType, static () => new DocumentFormat.OpenXml.Vml.PolyLine());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Rectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.Rectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.RoundRectangle.ElementType, static () => new DocumentFormat.OpenXml.Vml.RoundRectangle());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shape.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shape());
+            builder.AddChild(DocumentFormat.OpenXml.Vml.Shapetype.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shapetype());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
             {
                 new CompositeParticle.Builder(ParticleType.Group, 1, 1)
@@ -60000,8 +60000,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.StartOverrideNumberingValue>();
-            builder.AddChild<DocumentFormat.OpenXml.Wordprocessing.Level>();
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.StartOverrideNumberingValue.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.StartOverrideNumberingValue());
+            builder.AddChild(DocumentFormat.OpenXml.Wordprocessing.Level.ElementType, static () => new DocumentFormat.OpenXml.Wordprocessing.Level());
             builder.AddElement<LevelOverride>()
                 .AddAttribute("w:ilvl", a => a.LevelIndex, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/www_w3_org_2003_04_emma.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/www_w3_org_2003_04_emma.g.cs
index 2a87c3031..b110502fc 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/www_w3_org_2003_04_emma.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/www_w3_org_2003_04_emma.g.cs
@@ -249,8 +249,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Arc>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Node>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Arc.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Arc());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Node.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Node());
             builder.AddElement<Lattice>()
                 .AddAttribute("initial", a => a.Initial, aBuilder =>
                 {
@@ -710,11 +710,11 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.DerivedFrom>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Info>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Lattice>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Literal>();
-            builder.AddChild<DocumentFormat.OpenXml.Office2010.Ink.ContextNode>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.DerivedFrom.ElementType, static () => new DocumentFormat.OpenXml.EMMA.DerivedFrom());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Info.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Info());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Lattice.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Lattice());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Literal.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Literal());
+            builder.AddChild(DocumentFormat.OpenXml.Office2010.Ink.ContextNode.ElementType, static () => new DocumentFormat.OpenXml.Office2010.Ink.ContextNode());
             builder.AddElement<Interpretation>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -1149,12 +1149,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.DerivedFrom>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Info>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Interpretation>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.OneOf>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Sequence>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.DerivedFrom.ElementType, static () => new DocumentFormat.OpenXml.EMMA.DerivedFrom());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Group.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Group());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Info.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Info());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Interpretation.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Interpretation());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.OneOf.ElementType, static () => new DocumentFormat.OpenXml.EMMA.OneOf());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Sequence.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Sequence());
             builder.AddElement<OneOf>()
                 .AddAttribute("disjunction-type", a => a.DisjunctionType)
                 .AddAttribute("id", a => a.Id, aBuilder =>
@@ -1579,13 +1579,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.DerivedFrom>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.GroupInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Info>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Interpretation>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.OneOf>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Sequence>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.DerivedFrom.ElementType, static () => new DocumentFormat.OpenXml.EMMA.DerivedFrom());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Group.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Group());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.GroupInfo.ElementType, static () => new DocumentFormat.OpenXml.EMMA.GroupInfo());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Info.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Info());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Interpretation.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Interpretation());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.OneOf.ElementType, static () => new DocumentFormat.OpenXml.EMMA.OneOf());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Sequence.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Sequence());
             builder.AddElement<Group>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -2008,12 +2008,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.DerivedFrom>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Info>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Interpretation>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.OneOf>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Sequence>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.DerivedFrom.ElementType, static () => new DocumentFormat.OpenXml.EMMA.DerivedFrom());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Group.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Group());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Info.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Info());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Interpretation.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Interpretation());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.OneOf.ElementType, static () => new DocumentFormat.OpenXml.EMMA.OneOf());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Sequence.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Sequence());
             builder.AddElement<Sequence>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -2197,10 +2197,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Interpretation>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.OneOf>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Sequence>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Group.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Group());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Interpretation.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Interpretation());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.OneOf.ElementType, static () => new DocumentFormat.OpenXml.EMMA.OneOf());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Sequence.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Sequence());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.EMMA.Interpretation.ElementType, 1, 1),
@@ -2427,7 +2427,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.EndPoint>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.EndPoint.ElementType, static () => new DocumentFormat.OpenXml.EMMA.EndPoint());
             builder.AddElement<EndPointInfo>()
                 .AddAttribute("id", a => a.Id, aBuilder =>
                 {
@@ -2748,7 +2748,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Info>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Info.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Info());
             builder.AddElement<Node>()
                 .AddAttribute("node-number", a => a.NodeNumber, aBuilder =>
                 {
@@ -2977,7 +2977,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Info>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Info.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Info());
             builder.AddElement<Arc>()
                 .AddAttribute("from", a => a.From, aBuilder =>
                 {
@@ -3087,15 +3087,15 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Derivation>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.EndPointInfo>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Grammar>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Group>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Info>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Interpretation>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Model>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.OneOf>();
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Sequence>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Derivation.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Derivation());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.EndPointInfo.ElementType, static () => new DocumentFormat.OpenXml.EMMA.EndPointInfo());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Grammar.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Grammar());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Group.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Group());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Info.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Info());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Interpretation.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Interpretation());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Model.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Model());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.OneOf.ElementType, static () => new DocumentFormat.OpenXml.EMMA.OneOf());
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Sequence.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Sequence());
             builder.AddElement<Emma>()
                 .AddAttribute("version", a => a.Version, aBuilder =>
                 {
diff --git a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/www_w3_org_2003_InkML.g.cs b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/www_w3_org_2003_InkML.g.cs
index 4b17fc3bd..b68f3a29f 100644
--- a/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/www_w3_org_2003_InkML.g.cs
+++ b/generated/DocumentFormat.OpenXml/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/www_w3_org_2003_InkML.g.cs
@@ -88,13 +88,13 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Annotation>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.AnnotationXml>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Context>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Definitions>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Trace>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceView>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Annotation.ElementType, static () => new DocumentFormat.OpenXml.InkML.Annotation());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.AnnotationXml.ElementType, static () => new DocumentFormat.OpenXml.InkML.AnnotationXml());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Context.ElementType, static () => new DocumentFormat.OpenXml.InkML.Context());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Definitions.ElementType, static () => new DocumentFormat.OpenXml.InkML.Definitions());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Trace.ElementType, static () => new DocumentFormat.OpenXml.InkML.Trace());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceGroup.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceGroup());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceView.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceView());
             builder.AddElement<Ink>()
                 .AddAttribute("documentID", a => a.DocumentId, aBuilder =>
                 {
@@ -419,10 +419,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Bind>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Mapping>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Matrix>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Table>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Bind.ElementType, static () => new DocumentFormat.OpenXml.InkML.Bind());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Mapping.ElementType, static () => new DocumentFormat.OpenXml.InkML.Mapping());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Matrix.ElementType, static () => new DocumentFormat.OpenXml.InkML.Matrix());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Table.ElementType, static () => new DocumentFormat.OpenXml.InkML.Table());
             builder.AddElement<Mapping>()
                 .AddAttribute("xml:id", a => a.Id)
                 .AddAttribute("type", a => a.Type)
@@ -599,7 +599,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Mapping>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Mapping.ElementType, static () => new DocumentFormat.OpenXml.InkML.Mapping());
             builder.AddElement<Channel>()
                 .AddAttribute("xml:id", a => a.Id)
                 .AddAttribute("name", a => a.Name, aBuilder =>
@@ -709,7 +709,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Channel>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Channel.ElementType, static () => new DocumentFormat.OpenXml.InkML.Channel());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.InkML.Channel.ElementType, 0, 0)
@@ -899,8 +899,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Channel>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.IntermittentChannels>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Channel.ElementType, static () => new DocumentFormat.OpenXml.InkML.Channel());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.IntermittentChannels.ElementType, static () => new DocumentFormat.OpenXml.InkML.IntermittentChannels());
             builder.AddElement<TraceFormat>()
                 .AddAttribute("xml:id", a => a.Id);
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
@@ -1248,7 +1248,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.ChannelProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.ChannelProperty.ElementType, static () => new DocumentFormat.OpenXml.InkML.ChannelProperty());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(DocumentFormat.OpenXml.InkML.ChannelProperty.ElementType, 0, 0)
@@ -1409,7 +1409,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.EMMA.Emma>();
+            builder.AddChild(DocumentFormat.OpenXml.EMMA.Emma.ElementType, static () => new DocumentFormat.OpenXml.EMMA.Emma());
             builder.AddElement<AnnotationXml>()
                 .AddAttribute("type", a => a.Type)
                 .AddAttribute("encoding", a => a.Encoding)
@@ -1525,8 +1525,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Annotation>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.AnnotationXml>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Annotation.ElementType, static () => new DocumentFormat.OpenXml.InkML.Annotation());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.AnnotationXml.ElementType, static () => new DocumentFormat.OpenXml.InkML.AnnotationXml());
             builder.AddElement<BrushProperty>()
                 .AddAttribute("name", a => a.Name, aBuilder =>
                 {
@@ -1655,7 +1655,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceFormat.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceFormat());
             builder.AddElement<Canvas>()
                 .AddAttribute("xml:id", a => a.Id)
                 .AddAttribute("traceFormatRef", a => a.TraceFormatRef, aBuilder =>
@@ -1762,7 +1762,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Mapping>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Mapping.ElementType, static () => new DocumentFormat.OpenXml.InkML.Mapping());
             builder.AddElement<CanvasTransform>()
                 .AddAttribute("xml:id", a => a.Id)
                 .AddAttribute("invertible", a => a.Invertible);
@@ -1898,12 +1898,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.ActiveArea>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.ChannelProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Latency>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.SampleRate>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.SourceProperty>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.ActiveArea.ElementType, static () => new DocumentFormat.OpenXml.InkML.ActiveArea());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.ChannelProperties.ElementType, static () => new DocumentFormat.OpenXml.InkML.ChannelProperties());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Latency.ElementType, static () => new DocumentFormat.OpenXml.InkML.Latency());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.SampleRate.ElementType, static () => new DocumentFormat.OpenXml.InkML.SampleRate());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.SourceProperty.ElementType, static () => new DocumentFormat.OpenXml.InkML.SourceProperty());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceFormat.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceFormat());
             builder.AddElement<InkSource>()
                 .AddAttribute("xml:id", a => a.Id, aBuilder =>
                 {
@@ -2063,9 +2063,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Annotation>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.AnnotationXml>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.BrushProperty>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Annotation.ElementType, static () => new DocumentFormat.OpenXml.InkML.Annotation());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.AnnotationXml.ElementType, static () => new DocumentFormat.OpenXml.InkML.AnnotationXml());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.BrushProperty.ElementType, static () => new DocumentFormat.OpenXml.InkML.BrushProperty());
             builder.AddElement<Brush>()
                 .AddAttribute("xml:id", a => a.Id)
                 .AddAttribute("brushRef", a => a.BrushRef, aBuilder =>
@@ -2413,10 +2413,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Annotation>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.AnnotationXml>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Trace>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceGroup>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Annotation.ElementType, static () => new DocumentFormat.OpenXml.InkML.Annotation());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.AnnotationXml.ElementType, static () => new DocumentFormat.OpenXml.InkML.AnnotationXml());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Trace.ElementType, static () => new DocumentFormat.OpenXml.InkML.Trace());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceGroup.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceGroup());
             builder.AddElement<TraceGroup>()
                 .AddAttribute("xml:id", a => a.Id)
                 .AddAttribute("contextRef", a => a.ContextRef, aBuilder =>
@@ -2549,9 +2549,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Annotation>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.AnnotationXml>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceView>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Annotation.ElementType, static () => new DocumentFormat.OpenXml.InkML.Annotation());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.AnnotationXml.ElementType, static () => new DocumentFormat.OpenXml.InkML.AnnotationXml());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceView.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceView());
             builder.AddElement<TraceView>()
                 .AddAttribute("xml:id", a => a.Id)
                 .AddAttribute("contextRef", a => a.ContextRef, aBuilder =>
@@ -2718,12 +2718,12 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Brush>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Canvas>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.CanvasTransform>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.InkSource>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Timestamp>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceFormat>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Brush.ElementType, static () => new DocumentFormat.OpenXml.InkML.Brush());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Canvas.ElementType, static () => new DocumentFormat.OpenXml.InkML.Canvas());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.CanvasTransform.ElementType, static () => new DocumentFormat.OpenXml.InkML.CanvasTransform());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.InkSource.ElementType, static () => new DocumentFormat.OpenXml.InkML.InkSource());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Timestamp.ElementType, static () => new DocumentFormat.OpenXml.InkML.Timestamp());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceFormat.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceFormat());
             builder.AddElement<Context>()
                 .AddAttribute("xml:id", a => a.Id)
                 .AddAttribute("contextRef", a => a.ContextRef, aBuilder =>
@@ -2911,17 +2911,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema(ElementType);
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Brush>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Canvas>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.CanvasTransform>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Context>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.InkSource>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Mapping>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Timestamp>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.Trace>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceFormat>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceGroup>();
-            builder.AddChild<DocumentFormat.OpenXml.InkML.TraceView>();
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Brush.ElementType, static () => new DocumentFormat.OpenXml.InkML.Brush());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Canvas.ElementType, static () => new DocumentFormat.OpenXml.InkML.Canvas());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.CanvasTransform.ElementType, static () => new DocumentFormat.OpenXml.InkML.CanvasTransform());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Context.ElementType, static () => new DocumentFormat.OpenXml.InkML.Context());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.InkSource.ElementType, static () => new DocumentFormat.OpenXml.InkML.InkSource());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Mapping.ElementType, static () => new DocumentFormat.OpenXml.InkML.Mapping());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Timestamp.ElementType, static () => new DocumentFormat.OpenXml.InkML.Timestamp());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.Trace.ElementType, static () => new DocumentFormat.OpenXml.InkML.Trace());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceFormat.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceFormat());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceGroup.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceGroup());
+            builder.AddChild(DocumentFormat.OpenXml.InkML.TraceView.ElementType, static () => new DocumentFormat.OpenXml.InkML.TraceView());
             builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 0, 0)
             {
                 new ElementParticle(DocumentFormat.OpenXml.InkML.Brush.ElementType, 0, 1),
diff --git a/src/DocumentFormat.OpenXml.Framework/AlternateContent.cs b/src/DocumentFormat.OpenXml.Framework/AlternateContent.cs
index a744000aa..e362512c3 100644
--- a/src/DocumentFormat.OpenXml.Framework/AlternateContent.cs
+++ b/src/DocumentFormat.OpenXml.Framework/AlternateContent.cs
@@ -16,7 +16,8 @@ namespace DocumentFormat.OpenXml
     /// </summary>
     public class AlternateContent : OpenXmlCompositeElement
     {
-        internal static readonly OpenXmlQualifiedName InternalQName = new(@"http://schemas.openxmlformats.org/markup-compatibility/2006", "AlternateContent");
+        internal static readonly OpenXmlQualifiedName ElementQName = new(@"http://schemas.openxmlformats.org/markup-compatibility/2006", "AlternateContent");
+        internal static readonly OpenXmlSchemaType ElementType = new(ElementQName, default);
 
         /// <summary>
         /// Initializes a new instance of the AlternateContent
@@ -66,16 +67,16 @@ public AlternateContent(string outerXml)
         /// Gets a value that represents the markup compatibility
         /// namespace.
         /// </summary>
-        public static string MarkupCompatibilityNamespace => InternalQName.Namespace.Uri;
+        public static string MarkupCompatibilityNamespace => ElementQName.Namespace.Uri;
 
         /// <summary>
         /// Gets a value that represents the tag name of the
         /// AlternateContent element.
         /// </summary>
-        public static string TagName => InternalQName.Name;
+        public static string TagName => ElementQName.Name;
 
         /// <inheritdoc/>
-        public override string LocalName => InternalQName.Name;
+        public override string LocalName => ElementQName.Name;
 
         /// <summary>
         /// Appends a new child of type T:DocumentFormat.OpenXml.AlternateContentChoice
@@ -113,10 +114,10 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
 
-            builder.SetSchema(new(InternalQName, default));
+            builder.SetSchema(ElementType);
 
-            builder.AddChild<AlternateContentChoice>();
-            builder.AddChild<AlternateContentFallback>();
+            builder.AddChild(AlternateContentChoice.ElementType, () => new AlternateContentChoice());
+            builder.AddChild(AlternateContentFallback.ElementType, () => new AlternateContentFallback());
         }
     }
 }
diff --git a/src/DocumentFormat.OpenXml.Framework/AlternateContentChoice.cs b/src/DocumentFormat.OpenXml.Framework/AlternateContentChoice.cs
index 074f6b531..b5dd38186 100644
--- a/src/DocumentFormat.OpenXml.Framework/AlternateContentChoice.cs
+++ b/src/DocumentFormat.OpenXml.Framework/AlternateContentChoice.cs
@@ -12,10 +12,11 @@ namespace DocumentFormat.OpenXml
     /// </summary>
     public class AlternateContentChoice : OpenXmlCompositeElement
     {
-        internal static OpenXmlQualifiedName InternalQName => new(AlternateContent.InternalQName.Namespace.Uri, Name);
-
         private const string Name = "Choice";
 
+        internal static readonly OpenXmlQualifiedName ElementQName = new(AlternateContent.ElementQName.Namespace.Uri, Name);
+        internal static readonly OpenXmlSchemaType ElementType = new(ElementQName, default);
+
         /// <summary>
         /// Initializes a new instance of the
         /// AlternateContentChoice class.
@@ -116,7 +117,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
 
-            builder.SetSchema(new(new(AlternateContent.InternalQName.Namespace.Uri, Name), default));
+            builder.SetSchema(ElementType);
 
             builder.AddElement<AlternateContentChoice>()
                 .AddAttribute("Requires", a => a.Requires);
diff --git a/src/DocumentFormat.OpenXml.Framework/AlternateContentFallback.cs b/src/DocumentFormat.OpenXml.Framework/AlternateContentFallback.cs
index 1002d07ae..94d470110 100644
--- a/src/DocumentFormat.OpenXml.Framework/AlternateContentFallback.cs
+++ b/src/DocumentFormat.OpenXml.Framework/AlternateContentFallback.cs
@@ -12,10 +12,11 @@ namespace DocumentFormat.OpenXml
     /// </summary>
     public class AlternateContentFallback : OpenXmlCompositeElement
     {
-        internal static OpenXmlQualifiedName InternalQName => new(AlternateContent.InternalQName.Namespace.Uri, Name);
-
         private const string Name = "Fallback";
 
+        internal static readonly OpenXmlQualifiedName ElementQName = new(AlternateContent.ElementQName.Namespace.Uri, Name);
+        internal static readonly OpenXmlSchemaType ElementType = new(ElementQName, default);
+
         /// <summary>
         /// Initializes a new instance of the AlternateContentFallback class.
         /// </summary>
@@ -98,7 +99,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
 
-            builder.SetSchema(new(new(AlternateContent.InternalQName.Namespace.Uri, Name), default));
+            builder.SetSchema(ElementType);
         }
     }
 }
diff --git a/src/DocumentFormat.OpenXml.Framework/Framework/Metadata/ElementMetadata.cs b/src/DocumentFormat.OpenXml.Framework/Framework/Metadata/ElementMetadata.cs
index 9f17c4984..54a4b97fb 100644
--- a/src/DocumentFormat.OpenXml.Framework/Framework/Metadata/ElementMetadata.cs
+++ b/src/DocumentFormat.OpenXml.Framework/Framework/Metadata/ElementMetadata.cs
@@ -60,7 +60,7 @@ public class Builder : ValidatorBuilder
             private readonly IOpenXmlNamespaceResolver _resolver;
 
             private List<IMetadataBuilder<AttributeMetadata>>? _attributes;
-            private HashSet<IMetadataBuilder<ElementFactory>>? _children;
+            private List<ElementFactory>? _children;
             private List<IValidator>? _constraints;
             private OpenXmlSchemaType _type;
 
@@ -93,15 +93,14 @@ public OpenXmlQualifiedName CreateQName(string qname)
             public void SetSchema(in OpenXmlSchemaType type)
                 => _type = type;
 
-            public void AddChild<T>()
-                where T : OpenXmlElement, new()
+            public void AddChild(in OpenXmlSchemaType type, Func<OpenXmlElement> activator)
             {
                 if (_children is null)
                 {
-                    _children = new HashSet<IMetadataBuilder<ElementFactory>>();
+                    _children = [];
                 }
 
-                _children.Add(new KnownChild<T>());
+                _children.Add(new ElementFactory(type, activator));
             }
 
             public FileFormatVersions Availability { get; set; } = FileFormatVersions.Office2007;
@@ -118,7 +117,7 @@ public void Add(IMetadataBuilder<AttributeMetadata> builder)
 
             public ElementMetadata Build()
             {
-                var lookup = _children is null ? _lazy : new Lazy<ElementFactoryCollection>(() => new ElementFactoryCollection(_children.Select(c => c.Build())), true);
+                var lookup = _children is null ? _lazy : new Lazy<ElementFactoryCollection>(() => new ElementFactoryCollection(_children), true);
 
                 return new ElementMetadata(_type, BuildAttributes(), GetValidators(), _constraints?.ToArray(), Availability, Particle.Compile(), lookup);
             }
@@ -139,12 +138,6 @@ public ElementMetadata Build()
 
                 return attributes;
             }
-
-            private class KnownChild<T> : IMetadataBuilder<ElementFactory>
-                where T : OpenXmlElement, new()
-            {
-                public ElementFactory Build() => ElementFactory.Create<T>();
-            }
         }
 
         public class Builder<TElement> : ValidatorBuilder
diff --git a/src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs b/src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs
index 623ef993d..59a63d6f7 100644
--- a/src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs
+++ b/src/DocumentFormat.OpenXml.Framework/OpenXmlElement.cs
@@ -1833,7 +1833,7 @@ internal OpenXmlElement CreateElement(in OpenXmlQualifiedName qname, string pref
                 newElement = ElementFactory(qname);
 
                 // try AlternateContent
-                if (newElement is null && AlternateContent.InternalQName.Equals(qname))
+                if (newElement is null && AlternateContent.ElementQName.Equals(qname))
                 {
                     newElement = new AlternateContent();
                 }
diff --git a/test/DocumentFormat.OpenXml.Tests/ofapiTest/OpenXmlElementTest2.cs b/test/DocumentFormat.OpenXml.Tests/ofapiTest/OpenXmlElementTest2.cs
index eae9ffe8f..e2c8caa91 100644
--- a/test/DocumentFormat.OpenXml.Tests/ofapiTest/OpenXmlElementTest2.cs
+++ b/test/DocumentFormat.OpenXml.Tests/ofapiTest/OpenXmlElementTest2.cs
@@ -198,6 +198,21 @@ public void CanSetNullValue()
             Assert.Null(cell.Child);
         }
 
+        /// <summary>
+        /// A test for OpenXmlElement.GetOrAddFirstChild.
+        /// </summary>
+        [Fact]
+        public void GetOrAddFirstChildTest()
+        {
+            Paragraph p = new();
+            Run r = p.GetOrAddFirstChild<Run>();
+            Assert.NotNull(r);
+            Assert.Same(r, p.GetFirstChild<Run>());
+
+            var r2 = p.GetOrAddFirstChild<Run>();
+            Assert.Same(r, r2);
+        }
+
         private class WithChildElement : OpenXmlCompositeElement
         {
             public ChildElement Child
@@ -225,20 +240,5 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
                 builder.SetSchema(ElementType);
             }
         }
-
-        /// <summary>
-        /// A test for OpenXmlElement.GetOrAddFirstChild.
-        /// </summary>
-        [Fact]
-        public void GetOrAddFirstChildTest()
-        {
-            Paragraph p = new();
-            Run r = p.GetOrAddFirstChild<Run>();
-            Assert.NotNull(r);
-            Assert.Same(r, p.GetFirstChild<Run>());
-
-            var r2 = p.GetOrAddFirstChild<Run>();
-            Assert.Same(r, r2);
-        }
     }
 }