diff --git a/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json b/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json
index 297c3cc41..8361da4f2 100644
--- a/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json
+++ b/data/schemas/schemas_openxmlformats_org_drawingml_2006_main.json
@@ -11818,6 +11818,9 @@
         {
           "Name": "adec:CT_Decorative/adec:decorative"
         },
+        {
+          "Name": "ahyp:CT_HyperlinkColor/ahyp:hlinkClr"
+        },
         {
           "Name": "a16:CT_CreationId/a16:creationId"
         },
@@ -11833,9 +11836,6 @@
         {
           "Name": "a16:CT_Identifier/a16:colId"
         },
-        {
-          "Name": "ahyp:CT_HyperlinkColor/ahyp:hlinkClr"
-        },
         {
           "Name": "wp15:CT_WebVideoPr/wp15:webVideoPr"
         },
@@ -17381,84 +17381,6 @@
         ]
       }
     },
-    {
-      "Name": "a:CT_TableCell/a:tc",
-      "ClassName": "TableCell",
-      "Summary": "Table Cell.",
-      "CompositeType": "OneSequence",
-      "BaseClass": "OpenXmlCompositeElement",
-      "Attributes": [
-        {
-          "QName": ":rowSpan",
-          "PropertyName": "RowSpan",
-          "Type": "Int32Value",
-          "PropertyComments": "Row Span"
-        },
-        {
-          "QName": ":gridSpan",
-          "PropertyName": "GridSpan",
-          "Type": "Int32Value",
-          "PropertyComments": "Grid Span"
-        },
-        {
-          "QName": ":hMerge",
-          "PropertyName": "HorizontalMerge",
-          "Type": "BooleanValue",
-          "PropertyComments": "Horizontal Merge"
-        },
-        {
-          "QName": ":vMerge",
-          "PropertyName": "VerticalMerge",
-          "Type": "BooleanValue",
-          "PropertyComments": "Vertical Merge"
-        }
-      ],
-      "Children": [
-        {
-          "Name": "a:CT_TextBody/a:txBody",
-          "PropertyName": "TextBody",
-          "PropertyComments": "Text Body"
-        },
-        {
-          "Name": "a:CT_TableCellProperties/a:tcPr",
-          "PropertyName": "TableCellProperties",
-          "PropertyComments": "Table Cell Properties"
-        },
-        {
-          "Name": "a:CT_OfficeArtExtensionList/a:extLst",
-          "PropertyName": "ExtensionList"
-        }
-      ],
-      "Particle": {
-        "Kind": "Sequence",
-        "Items": [
-          {
-            "Name": "a:CT_TextBody/a:txBody",
-            "Occurs": [
-              {
-                "Max": 1
-              }
-            ]
-          },
-          {
-            "Name": "a:CT_TableCellProperties/a:tcPr",
-            "Occurs": [
-              {
-                "Max": 1
-              }
-            ]
-          },
-          {
-            "Name": "a:CT_OfficeArtExtensionList/a:extLst",
-            "Occurs": [
-              {
-                "Max": 1
-              }
-            ]
-          }
-        ]
-      }
-    },
     {
       "Name": "a:CT_TableStyle/a:tableStyle",
       "ClassName": "TableStyle",
@@ -18054,7 +17976,7 @@
           "QName": ":w",
           "PropertyName": "Width",
           "Type": "Int64Value",
-          "PropertyComments": "Width",
+          "PropertyComments": "w",
           "Validators": [
             {
               "Name": "RequiredValidator"
@@ -18080,15 +18002,15 @@
       ],
       "Children": [
         {
-          "Name": "a:CT_OfficeArtExtensionList/a:extLst",
-          "PropertyName": "ExtensionList"
+          "Name": "a:CT_TableColExtensionList/a:extLst",
+          "PropertyName": "TableColExtensionList"
         }
       ],
       "Particle": {
         "Kind": "Sequence",
         "Items": [
           {
-            "Name": "a:CT_OfficeArtExtensionList/a:extLst",
+            "Name": "a:CT_TableColExtensionList/a:extLst",
             "Occurs": [
               {
                 "Max": 1
@@ -18301,7 +18223,7 @@
           "QName": ":h",
           "PropertyName": "Height",
           "Type": "Int64Value",
-          "PropertyComments": "Height",
+          "PropertyComments": "h",
           "Validators": [
             {
               "Name": "RequiredValidator"
@@ -18330,7 +18252,7 @@
           "Name": "a:CT_TableCell/a:tc"
         },
         {
-          "Name": "a:CT_OfficeArtExtensionList/a:extLst"
+          "Name": "a:CT_TableRowExtensionList/a:extLst"
         }
       ],
       "Particle": {
@@ -18343,7 +18265,7 @@
             ]
           },
           {
-            "Name": "a:CT_OfficeArtExtensionList/a:extLst",
+            "Name": "a:CT_TableRowExtensionList/a:extLst",
             "Occurs": [
               {
                 "Max": 1
@@ -25037,6 +24959,186 @@
         ]
       }
     },
+    {
+      "Name": "a:CT_TableColExtension/a:ext",
+      "ClassName": "TableColExtension",
+      "Summary": "Defines the TableColExtension Class.",
+      "BaseClass": "OpenXmlCompositeElement",
+      "Children": [
+        {
+          "Name": "a16:CT_Identifier/a16:colId",
+          "PropertyName": "ColIdIdentifier"
+        }
+      ],
+      "Particle": {
+        "Kind": "Choice",
+        "Items": [
+          {
+            "Name": "a16:CT_Identifier/a16:colId",
+            "InitialVersion": "Office2016"
+          },
+          {
+            "Kind": "Any",
+            "Occurs": [
+              {
+                "Max": 1
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "Name": "a:CT_TableRowExtension/a:ext",
+      "ClassName": "TableRowExtension",
+      "Summary": "Defines the TableRowExtension Class.",
+      "BaseClass": "OpenXmlCompositeElement",
+      "Children": [
+        {
+          "Name": "a16:CT_Identifier/a16:rowId",
+          "PropertyName": "RowIdIdentifier"
+        }
+      ],
+      "Particle": {
+        "Kind": "Choice",
+        "Items": [
+          {
+            "Name": "a16:CT_Identifier/a16:rowId",
+            "InitialVersion": "Office2016"
+          },
+          {
+            "Kind": "Any",
+            "Occurs": [
+              {
+                "Max": 1
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "Name": "a:CT_TableColExtensionList/a:extLst",
+      "ClassName": "TableColExtensionList",
+      "Summary": "Defines the TableColExtensionList Class.",
+      "BaseClass": "OpenXmlCompositeElement",
+      "Children": [
+        {
+          "Name": "a:CT_TableColExtension/a:ext"
+        }
+      ],
+      "Particle": {
+        "Kind": "Sequence",
+        "Items": [
+          {
+            "Name": "a:CT_TableColExtension/a:ext",
+            "Occurs": [
+              {}
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "Name": "a:CT_TableCell/a:tc",
+      "ClassName": "TableCell",
+      "Summary": "Defines the TableCell Class.",
+      "CompositeType": "OneSequence",
+      "BaseClass": "OpenXmlCompositeElement",
+      "Attributes": [
+        {
+          "QName": ":rowSpan",
+          "PropertyName": "RowSpan",
+          "Type": "Int32Value",
+          "PropertyComments": "Row Span"
+        },
+        {
+          "QName": ":gridSpan",
+          "PropertyName": "GridSpan",
+          "Type": "Int32Value",
+          "PropertyComments": "Grid Span"
+        },
+        {
+          "QName": ":hMerge",
+          "PropertyName": "HorizontalMerge",
+          "Type": "BooleanValue",
+          "PropertyComments": "Horizontal Merge"
+        },
+        {
+          "QName": ":vMerge",
+          "PropertyName": "VerticalMerge",
+          "Type": "BooleanValue",
+          "PropertyComments": "Vertical Merge"
+        }
+      ],
+      "Children": [
+        {
+          "Name": "a:CT_TextBody/a:txBody",
+          "PropertyName": "TextBody",
+          "PropertyComments": "Text Body"
+        },
+        {
+          "Name": "a:CT_TableCellProperties/a:tcPr",
+          "PropertyName": "TableCellProperties",
+          "PropertyComments": "Table Cell Properties"
+        },
+        {
+          "Name": "a:CT_OfficeArtExtensionList/a:extLst",
+          "PropertyName": "ExtensionList"
+        }
+      ],
+      "Particle": {
+        "Kind": "Sequence",
+        "Items": [
+          {
+            "Name": "a:CT_TextBody/a:txBody",
+            "Occurs": [
+              {
+                "Max": 1
+              }
+            ]
+          },
+          {
+            "Name": "a:CT_TableCellProperties/a:tcPr",
+            "Occurs": [
+              {
+                "Max": 1
+              }
+            ]
+          },
+          {
+            "Name": "a:CT_OfficeArtExtensionList/a:extLst",
+            "Occurs": [
+              {
+                "Max": 1
+              }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "Name": "a:CT_TableRowExtensionList/a:extLst",
+      "ClassName": "TableRowExtensionList",
+      "Summary": "Defines the TableRowExtensionList Class.",
+      "BaseClass": "OpenXmlCompositeElement",
+      "Children": [
+        {
+          "Name": "a:CT_TableRowExtension/a:ext"
+        }
+      ],
+      "Particle": {
+        "Kind": "Sequence",
+        "Items": [
+          {
+            "Name": "a:CT_TableRowExtension/a:ext",
+            "Occurs": [
+              {}
+            ]
+          }
+        ]
+      }
+    },
     {
       "Name": "a:CT_HyperlinkExtension/a:ext",
       "ClassName": "HyperlinkExtension",
diff --git a/data/typed/schemas_openxmlformats_org_drawingml_2006_main.json b/data/typed/schemas_openxmlformats_org_drawingml_2006_main.json
index 1bb759de4..7b982a9b9 100644
--- a/data/typed/schemas_openxmlformats_org_drawingml_2006_main.json
+++ b/data/typed/schemas_openxmlformats_org_drawingml_2006_main.json
@@ -619,6 +619,14 @@
     "Name": "a:CT_ShapePropertiesExtension/a:ext",
     "ClassName": "ShapePropertiesExtension"
   },
+  {
+    "Name": "a:CT_TableColExtension/a:ext",
+    "ClassName": "TableColExtension"
+  },
+  {
+    "Name": "a:CT_TableRowExtension/a:ext",
+    "ClassName": "TableRowExtension"
+  },
   {
     "Name": "a:CT_BlipExtensionList/a:extLst",
     "ClassName": "BlipExtensionList"
@@ -663,6 +671,14 @@
     "Name": "a:CT_ShapePropertiesExtensionList/a:extLst",
     "ClassName": "ShapePropertiesExtensionList"
   },
+  {
+    "Name": "a:CT_TableColExtensionList/a:extLst",
+    "ClassName": "TableColExtensionList"
+  },
+  {
+    "Name": "a:CT_TableRowExtensionList/a:extLst",
+    "ClassName": "TableRowExtensionList"
+  },
   {
     "Name": "a:CT_ColorSchemeAndMapping/a:extraClrScheme",
     "ClassName": "ExtraColorScheme"
diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs
index ee852f5fd..e977947b3 100644
--- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs
+++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A.g.cs
@@ -1396,9 +1396,9 @@ public static partial class A
         /// <para>As an XML element, it:</para>
         /// <list type="bullet">
         /// <item><description>has the following parent XML elements: <see cref="extLst" />, <see cref="xfrm" />, <see cref="A14.extLst" />, <see cref="A14.xfrm" />, <see cref="ALF.extLst" />, <see cref="AOE.extLst" />, <see cref="ASK.extLst" />, <see cref="ASL.extLst" />, <see cref="CDR.xfrm" />, <see cref="CDR14.extLst" />, <see cref="CDR14.xfrm" />, <see cref="CS.extLst" />, <see cref="DGM.extLst" />, <see cref="DSP.extLst" />, <see cref="DSP.txXfrm" />, <see cref="P.xfrm" />, <see cref="P14.xfrm" />, <see cref="PIC14.extLst" />, <see cref="SLE.extLst" />, <see cref="THM15.extLst" />, <see cref="TSLE.extLst" />, <see cref="W14.extLst" />, <see cref="W14.xfrm" />, <see cref="WE.extLst" />, <see cref="WETP.extLst" />, <see cref="WPC.extLst" />, <see cref="WPG.extLst" />, <see cref="WPG.xfrm" />, <see cref="WPS.extLst" />, <see cref="XDR.xfrm" />, <see cref="XDR14.extLst" />, <see cref="XDR14.xfrm" />.</description></item>
-        /// <item><description>has the following child XML elements: <see cref="graphic" />, <see cref="A14.cameraTool" />, <see cref="A14.compatExt" />, <see cref="A14.hiddenEffects" />, <see cref="A14.hiddenFill" />, <see cref="A14.hiddenLine" />, <see cref="A14.hiddenScene3d" />, <see cref="A14.hiddenSp3d" />, <see cref="A14.imgProps" />, <see cref="A14.isCanvas" />, <see cref="A14.shadowObscured" />, <see cref="A14.useLocalDpi" />, <see cref="A15.backgroundPr" />, <see cref="A15.nonVisualGroupProps" />, <see cref="A15.objectPr" />, <see cref="A15.signatureLine" />, <see cref="A16.creationId" />, <see cref="A16.predDERef" />, <see cref="A1611.picAttrSrcUrl" />, <see cref="ACLSH.classification" />, <see cref="ADEC.decorative" />, <see cref="AHYP.hlinkClr" />, <see cref="AIF.imageFormula" />, <see cref="ALF.liveFeedProps" />, <see cref="AOE.oembedShared" />, <see cref="ASK.lineSketchStyleProps" />, <see cref="ASL.scriptLink" />, <see cref="ASVG.svgBlip" />, <see cref="DGM14.cNvPr" />, <see cref="DGM14.recolorImg" />, <see cref="DSP.dataModelExt" />, <see cref="THM15.themeFamily" />, <see cref="WOE.oembed" />, <see cref="WP15.webVideoPr" />.</description></item>
+        /// <item><description>has the following child XML elements: <see cref="graphic" />, <see cref="A14.cameraTool" />, <see cref="A14.compatExt" />, <see cref="A14.hiddenEffects" />, <see cref="A14.hiddenFill" />, <see cref="A14.hiddenLine" />, <see cref="A14.hiddenScene3d" />, <see cref="A14.hiddenSp3d" />, <see cref="A14.imgProps" />, <see cref="A14.isCanvas" />, <see cref="A14.shadowObscured" />, <see cref="A14.useLocalDpi" />, <see cref="A15.backgroundPr" />, <see cref="A15.nonVisualGroupProps" />, <see cref="A15.objectPr" />, <see cref="A15.signatureLine" />, <see cref="A16.colId" />, <see cref="A16.creationId" />, <see cref="A16.predDERef" />, <see cref="A16.rowId" />, <see cref="A1611.picAttrSrcUrl" />, <see cref="ACLSH.classification" />, <see cref="ADEC.decorative" />, <see cref="AHYP.hlinkClr" />, <see cref="AIF.imageFormula" />, <see cref="ALF.liveFeedProps" />, <see cref="AOE.oembedShared" />, <see cref="ASK.lineSketchStyleProps" />, <see cref="ASL.scriptLink" />, <see cref="ASVG.svgBlip" />, <see cref="DGM14.cNvPr" />, <see cref="DGM14.recolorImg" />, <see cref="DSP.dataModelExt" />, <see cref="THM15.themeFamily" />, <see cref="WOE.oembed" />, <see cref="WP15.webVideoPr" />.</description></item>
         /// <item><description>has the following XML attributes: <see cref="NoNamespace.uri" />.</description></item>
-        /// <item><description>corresponds to the following strongly-typed classes: BlipExtension, ConnectorLockingExtension, DataModelExtension, Extension, Extents, GvmlGroupShapeExtension, HyperlinkExtension, LinePropertiesExtension, NonVisualDrawingPropertiesExtension, NonVisualGroupDrawingShapePropsExtension, NonVisualPicturePropertiesExtension, OfficeStyleSheetExtension, PtExtension, ShapePropertiesExtension.</description></item>
+        /// <item><description>corresponds to the following strongly-typed classes: BlipExtension, ConnectorLockingExtension, DataModelExtension, Extension, Extents, GvmlGroupShapeExtension, HyperlinkExtension, LinePropertiesExtension, NonVisualDrawingPropertiesExtension, NonVisualGroupDrawingShapePropsExtension, NonVisualPicturePropertiesExtension, OfficeStyleSheetExtension, PtExtension, ShapePropertiesExtension, TableColExtension, TableRowExtension.</description></item>
         /// </list>
         /// </remarks>
         public static readonly XName ext = a + "ext";
@@ -1411,7 +1411,7 @@ public static partial class A
         /// <list type="bullet">
         /// <item><description>has the following parent XML elements: <see cref="audioCd" />, <see cref="audioFile" />, <see cref="backdrop" />, <see cref="blip" />, <see cref="bodyPr" />, <see cref="cell3D" />, <see cref="clrMap" />, <see cref="clrScheme" />, <see cref="cNvCxnSpPr" />, <see cref="cNvGraphicFramePr" />, <see cref="cNvGrpSpPr" />, <see cref="cNvPicPr" />, <see cref="cNvPr" />, <see cref="cNvSpPr" />, <see cref="cxnSp" />, <see cref="cxnSpLocks" />, <see cref="defPPr" />, <see cref="defRPr" />, <see cref="endParaRPr" />, <see cref="font" />, <see cref="fontScheme" />, <see cref="graphicFrame" />, <see cref="graphicFrameLocks" />, <see cref="gridCol" />, <see cref="grpSp" />, <see cref="grpSpLocks" />, <see cref="grpSpPr" />, <see cref="hlinkClick" />, <see cref="hlinkHover" />, <see cref="hlinkMouseOver" />, <see cref="ln" />, <see cref="lnB" />, <see cref="lnBlToTr" />, <see cref="lnDef" />, <see cref="lnL" />, <see cref="lnR" />, <see cref="lnT" />, <see cref="lnTlToBr" />, <see cref="lstStyle" />, <see cref="lvl1pPr" />, <see cref="lvl2pPr" />, <see cref="lvl3pPr" />, <see cref="lvl4pPr" />, <see cref="lvl5pPr" />, <see cref="lvl6pPr" />, <see cref="lvl7pPr" />, <see cref="lvl8pPr" />, <see cref="lvl9pPr" />, <see cref="majorFont" />, <see cref="minorFont" />, <see cref="objectDefaults" />, <see cref="overrideClrMapping" />, <see cref="pic" />, <see cref="picLocks" />, <see cref="pPr" />, <see cref="quickTimeFile" />, <see cref="rPr" />, <see cref="scene3d" />, <see cref="sp" />, <see cref="sp3d" />, <see cref="spDef" />, <see cref="spLocks" />, <see cref="spPr" />, <see cref="tableStyle" />, <see cref="tblPr" />, <see cref="tblStyle" />, <see cref="tc" />, <see cref="tcBdr" />, <see cref="tcPr" />, <see cref="tcTxStyle" />, <see cref="theme" />, <see cref="themeElements" />, <see cref="tr" />, <see cref="txDef" />, <see cref="txSp" />, <see cref="uLn" />, <see cref="videoFile" />, <see cref="A14.cNvPr" />, <see cref="A14.hiddenLine" />, <see cref="A14.hiddenScene3d" />, <see cref="A14.hiddenSp3d" />, <see cref="C.clrMapOvr" />, <see cref="C.spPr" />, <see cref="C14.spPr" />, <see cref="C15.spPr" />, <see cref="C16.spPr" />, <see cref="CDR.cNvCxnSpPr" />, <see cref="CDR.cNvGraphicFramePr" />, <see cref="CDR.cNvGrpSpPr" />, <see cref="CDR.cNvPicPr" />, <see cref="CDR.cNvPr" />, <see cref="CDR.cNvSpPr" />, <see cref="CDR.grpSpPr" />, <see cref="CDR.spPr" />, <see cref="CDR14.cNvPr" />, <see cref="CS.bodyPr" />, <see cref="CS.defRPr" />, <see cref="CS.spPr" />, <see cref="CX.clrMapOvr" />, <see cref="CX.spPr" />, <see cref="DGM.scene3d" />, <see cref="DGM.sp3d" />, <see cref="DGM.spPr" />, <see cref="DGM14.cNvPr" />, <see cref="DGM1612.lstStyle" />, <see cref="DGM1612.spPr" />, <see cref="DSP.cNvGrpSpPr" />, <see cref="DSP.cNvPr" />, <see cref="DSP.cNvSpPr" />, <see cref="DSP.grpSpPr" />, <see cref="DSP.spPr" />, <see cref="LC.lockedCanvas" />, <see cref="OAC.cNvGrpSpPr" />, <see cref="OAC.cNvPr" />, <see cref="OAC.grpSpPr" />, <see cref="OAC.lineProps" />, <see cref="OAC.pPr" />, <see cref="P.bodyStyle" />, <see cref="P.clrMap" />, <see cref="P.cNvCxnSpPr" />, <see cref="P.cNvGraphicFramePr" />, <see cref="P.cNvGrpSpPr" />, <see cref="P.cNvPicPr" />, <see cref="P.cNvPr" />, <see cref="P.cNvSpPr" />, <see cref="P.defaultTextStyle" />, <see cref="P.grpSpPr" />, <see cref="P.notesStyle" />, <see cref="P.otherStyle" />, <see cref="P.spPr" />, <see cref="P.titleStyle" />, <see cref="P14.cNvPr" />, <see cref="PIC.cNvPicPr" />, <see cref="PIC.cNvPr" />, <see cref="PIC.spPr" />, <see cref="W14.cNvPr" />, <see cref="WE.snapshot" />, <see cref="WP.cNvGraphicFramePr" />, <see cref="WP.docPr" />, <see cref="WPG.cNvFrPr" />, <see cref="WPG.cNvGrpSpPr" />, <see cref="WPG.cNvPr" />, <see cref="WPG.grpSpPr" />, <see cref="WPS.bodyPr" />, <see cref="WPS.cNvCnPr" />, <see cref="WPS.cNvPr" />, <see cref="WPS.cNvSpPr" />, <see cref="WPS.spPr" />, <see cref="XDR.cNvCxnSpPr" />, <see cref="XDR.cNvGraphicFramePr" />, <see cref="XDR.cNvGrpSpPr" />, <see cref="XDR.cNvPicPr" />, <see cref="XDR.cNvPr" />, <see cref="XDR.cNvSpPr" />, <see cref="XDR.grpSpPr" />, <see cref="XDR.spPr" />, <see cref="XDR14.cNvPr" />.</description></item>
         /// <item><description>has the following child XML elements: <see cref="ext" />.</description></item>
-        /// <item><description>corresponds to the following strongly-typed classes: BlipExtensionList, ConnectorLockingExtensionList, ExtensionList, GvmlGroupShapeExtensionList, HyperlinkExtensionList, LinePropertiesExtensionList, NonVisualDrawingPropertiesExtensionList, NonVisualGroupDrawingShapePropsExtensionList, NonVisualPicturePropertiesExtensionList, OfficeStyleSheetExtensionList, ShapePropertiesExtensionList.</description></item>
+        /// <item><description>corresponds to the following strongly-typed classes: BlipExtensionList, ConnectorLockingExtensionList, ExtensionList, GvmlGroupShapeExtensionList, HyperlinkExtensionList, LinePropertiesExtensionList, NonVisualDrawingPropertiesExtensionList, NonVisualGroupDrawingShapePropsExtensionList, NonVisualPicturePropertiesExtensionList, OfficeStyleSheetExtensionList, ShapePropertiesExtensionList, TableColExtensionList, TableRowExtensionList.</description></item>
         /// </list>
         /// </remarks>
         public static readonly XName extLst = a + "extLst";
diff --git a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A16.g.cs b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A16.g.cs
index 34051cd10..6e3ae170f 100644
--- a/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A16.g.cs
+++ b/generated/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.OpenXmlGenerator/Linq.A16.g.cs
@@ -21,7 +21,7 @@ public static partial class A16
         /// <remarks>
         /// <para>As an XML element, it:</para>
         /// <list type="bullet">
-        /// <item><description>has the following parent XML elements: <see cref="A.graphicData" />.</description></item>
+        /// <item><description>has the following parent XML elements: <see cref="A.ext" />, <see cref="A.graphicData" />.</description></item>
         /// <item><description>corresponds to the following strongly-typed classes: ColIdIdentifier.</description></item>
         /// </list>
         /// </remarks>
@@ -72,7 +72,7 @@ public static partial class A16
         /// <remarks>
         /// <para>As an XML element, it:</para>
         /// <list type="bullet">
-        /// <item><description>has the following parent XML elements: <see cref="A.graphicData" />.</description></item>
+        /// <item><description>has the following parent XML elements: <see cref="A.ext" />, <see cref="A.graphicData" />.</description></item>
         /// <item><description>corresponds to the following strongly-typed classes: RowIdIdentifier.</description></item>
         /// </list>
         /// </remarks>
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 c1161b102..c811be072 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
@@ -22681,157 +22681,6 @@ public DocumentFormat.OpenXml.Drawing.Cell3DProperties? Cell3DProperties
         public override OpenXmlElement CloneNode(bool deep) => CloneImp<TableCellProperties>(deep);
     }
 
-    /// <summary>
-    /// <para>Table Cell.</para>
-    /// <para>This class is available in Office 2007 and above.</para>
-    /// <para>When the object is serialized out as xml, it's qualified name is a:tc.</para>
-    /// </summary>
-    /// <remarks>
-    /// <para>The following table lists the possible child types:</para>
-    /// <list type="bullet">
-    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.ExtensionList" /> <c>&lt;a:extLst></c></description></item>
-    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TableCellProperties" /> <c>&lt;a:tcPr></c></description></item>
-    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TextBody" /> <c>&lt;a:txBody></c></description></item>
-    /// </list>
-    /// </remarks>
-    public partial class TableCell : OpenXmlCompositeElement
-    {
-        /// <summary>
-        /// Initializes a new instance of the TableCell class.
-        /// </summary>
-        public TableCell() : base()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the TableCell class with the specified child elements.
-        /// </summary>
-        /// <param name="childElements">Specifies the child elements.</param>
-        public TableCell(IEnumerable<OpenXmlElement> childElements) : base(childElements)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the TableCell class with the specified child elements.
-        /// </summary>
-        /// <param name="childElements">Specifies the child elements.</param>
-        public TableCell(params OpenXmlElement[] childElements) : base(childElements)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the TableCell class from outer XML.
-        /// </summary>
-        /// <param name="outerXml">Specifies the outer XML of the element.</param>
-        public TableCell(string outerXml) : base(outerXml)
-        {
-        }
-
-        /// <summary>
-        /// <para>Row Span</para>
-        /// <para>Represents the following attribute in the schema: rowSpan</para>
-        /// </summary>
-        public Int32Value? RowSpan
-        {
-            get => GetAttribute<Int32Value>();
-            set => SetAttribute(value);
-        }
-
-        /// <summary>
-        /// <para>Grid Span</para>
-        /// <para>Represents the following attribute in the schema: gridSpan</para>
-        /// </summary>
-        public Int32Value? GridSpan
-        {
-            get => GetAttribute<Int32Value>();
-            set => SetAttribute(value);
-        }
-
-        /// <summary>
-        /// <para>Horizontal Merge</para>
-        /// <para>Represents the following attribute in the schema: hMerge</para>
-        /// </summary>
-        public BooleanValue? HorizontalMerge
-        {
-            get => GetAttribute<BooleanValue>();
-            set => SetAttribute(value);
-        }
-
-        /// <summary>
-        /// <para>Vertical Merge</para>
-        /// <para>Represents the following attribute in the schema: vMerge</para>
-        /// </summary>
-        public BooleanValue? VerticalMerge
-        {
-            get => GetAttribute<BooleanValue>();
-            set => SetAttribute(value);
-        }
-
-        internal override void ConfigureMetadata(ElementMetadata.Builder builder)
-        {
-            base.ConfigureMetadata(builder);
-            builder.SetSchema("a:tc");
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableCellProperties>();
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.TextBody>();
-            builder.AddElement<TableCell>()
-                .AddAttribute("rowSpan", a => a.RowSpan)
-                .AddAttribute("gridSpan", a => a.GridSpan)
-                .AddAttribute("hMerge", a => a.HorizontalMerge)
-                .AddAttribute("vMerge", a => a.VerticalMerge);
-            builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
-            {
-                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TextBody), 0, 1),
-                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TableCellProperties), 0, 1),
-                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.ExtensionList), 0, 1)
-            };
-            builder.AddConstraint(new AttributeValueRangeConstraint(builder.CreateQName("a:rowSpan"), true, 1, true, double.PositiveInfinity, true));
-            builder.AddConstraint(new AttributeValueRangeConstraint(builder.CreateQName("a:gridSpan"), true, 1, true, double.PositiveInfinity, true));
-        }
-
-        /// <summary>
-        /// <para>Text Body.</para>
-        /// <para>Represents the following element tag in the schema: a:txBody.</para>
-        /// </summary>
-        /// <remarks>
-        /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main
-        /// </remarks>
-        public DocumentFormat.OpenXml.Drawing.TextBody? TextBody
-        {
-            get => GetElement<DocumentFormat.OpenXml.Drawing.TextBody>();
-            set => SetElement(value);
-        }
-
-        /// <summary>
-        /// <para>Table Cell Properties.</para>
-        /// <para>Represents the following element tag in the schema: a:tcPr.</para>
-        /// </summary>
-        /// <remarks>
-        /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main
-        /// </remarks>
-        public DocumentFormat.OpenXml.Drawing.TableCellProperties? TableCellProperties
-        {
-            get => GetElement<DocumentFormat.OpenXml.Drawing.TableCellProperties>();
-            set => SetElement(value);
-        }
-
-        /// <summary>
-        /// <para>ExtensionList.</para>
-        /// <para>Represents the following element tag in the schema: a:extLst.</para>
-        /// </summary>
-        /// <remarks>
-        /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main
-        /// </remarks>
-        public DocumentFormat.OpenXml.Drawing.ExtensionList? ExtensionList
-        {
-            get => GetElement<DocumentFormat.OpenXml.Drawing.ExtensionList>();
-            set => SetElement(value);
-        }
-
-        /// <inheritdoc/>
-        public override OpenXmlElement CloneNode(bool deep) => CloneImp<TableCell>(deep);
-    }
-
     /// <summary>
     /// <para>Table Style.</para>
     /// <para>This class is available in Office 2007 and above.</para>
@@ -23356,7 +23205,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
     /// <remarks>
     /// <para>The following table lists the possible child types:</para>
     /// <list type="bullet">
-    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.ExtensionList" /> <c>&lt;a:extLst></c></description></item>
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TableColExtensionList" /> <c>&lt;a:extLst></c></description></item>
     /// </list>
     /// </remarks>
     public partial class GridColumn : OpenXmlCompositeElement
@@ -23393,7 +23242,7 @@ public GridColumn(string outerXml) : base(outerXml)
         }
 
         /// <summary>
-        /// <para>Width</para>
+        /// <para>w</para>
         /// <para>Represents the following attribute in the schema: w</para>
         /// </summary>
         public Int64Value? Width
@@ -23406,7 +23255,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema("a:gridCol");
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableColExtensionList>();
             builder.AddElement<GridColumn>()
                 .AddAttribute("w", a => a.Width, aBuilder =>
                 {
@@ -23415,20 +23264,20 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
                 });
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
-                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.ExtensionList), 0, 1)
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TableColExtensionList), 0, 1)
             };
         }
 
         /// <summary>
-        /// <para>ExtensionList.</para>
+        /// <para>TableColExtensionList.</para>
         /// <para>Represents the following element tag in the schema: a:extLst.</para>
         /// </summary>
         /// <remarks>
         /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main
         /// </remarks>
-        public DocumentFormat.OpenXml.Drawing.ExtensionList? ExtensionList
+        public DocumentFormat.OpenXml.Drawing.TableColExtensionList? TableColExtensionList
         {
-            get => GetElement<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            get => GetElement<DocumentFormat.OpenXml.Drawing.TableColExtensionList>();
             set => SetElement(value);
         }
 
@@ -23685,8 +23534,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
     /// <remarks>
     /// <para>The following table lists the possible child types:</para>
     /// <list type="bullet">
-    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.ExtensionList" /> <c>&lt;a:extLst></c></description></item>
     ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TableCell" /> <c>&lt;a:tc></c></description></item>
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TableRowExtensionList" /> <c>&lt;a:extLst></c></description></item>
     /// </list>
     /// </remarks>
     public partial class TableRow : OpenXmlCompositeElement
@@ -23723,7 +23572,7 @@ public TableRow(string outerXml) : base(outerXml)
         }
 
         /// <summary>
-        /// <para>Height</para>
+        /// <para>h</para>
         /// <para>Represents the following attribute in the schema: h</para>
         /// </summary>
         public Int64Value? Height
@@ -23736,8 +23585,8 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         {
             base.ConfigureMetadata(builder);
             builder.SetSchema("a:tr");
-            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
             builder.AddChild<DocumentFormat.OpenXml.Drawing.TableCell>();
+            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableRowExtensionList>();
             builder.AddElement<TableRow>()
                 .AddAttribute("h", a => a.Height, aBuilder =>
                 {
@@ -23747,7 +23596,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
             builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
             {
                 new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TableCell), 0, 0),
-                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.ExtensionList), 0, 1)
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TableRowExtensionList), 0, 1)
             };
         }
 
@@ -30992,6 +30841,395 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
         public override OpenXmlElement CloneNode(bool deep) => CloneImp<PtExtension>(deep);
     }
 
+    /// <summary>
+    /// <para>Defines the TableColExtension Class.</para>
+    /// <para>This class is available in Office 2007 and above.</para>
+    /// <para>When the object is serialized out as xml, it's qualified name is a:ext.</para>
+    /// </summary>
+    /// <remarks>
+    /// <para>The following table lists the possible child types:</para>
+    /// <list type="bullet">
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Office2016.Drawing.ColIdIdentifier" /> <c>&lt;a16:colId></c></description></item>
+    /// </list>
+    /// </remarks>
+    public partial class TableColExtension : OpenXmlCompositeElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the TableColExtension class.
+        /// </summary>
+        public TableColExtension() : base()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableColExtension class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableColExtension(IEnumerable<OpenXmlElement> childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableColExtension class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableColExtension(params OpenXmlElement[] childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableColExtension class from outer XML.
+        /// </summary>
+        /// <param name="outerXml">Specifies the outer XML of the element.</param>
+        public TableColExtension(string outerXml) : base(outerXml)
+        {
+        }
+
+        internal override void ConfigureMetadata(ElementMetadata.Builder builder)
+        {
+            base.ConfigureMetadata(builder);
+            builder.SetSchema("a:ext");
+            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.ColIdIdentifier>();
+            builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
+            {
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Office2016.Drawing.ColIdIdentifier), 1, 1, version: FileFormatVersions.Office2016),
+                new AnyParticle(0, 1)
+            };
+        }
+
+        /// <inheritdoc/>
+        public override OpenXmlElement CloneNode(bool deep) => CloneImp<TableColExtension>(deep);
+    }
+
+    /// <summary>
+    /// <para>Defines the TableRowExtension Class.</para>
+    /// <para>This class is available in Office 2007 and above.</para>
+    /// <para>When the object is serialized out as xml, it's qualified name is a:ext.</para>
+    /// </summary>
+    /// <remarks>
+    /// <para>The following table lists the possible child types:</para>
+    /// <list type="bullet">
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Office2016.Drawing.RowIdIdentifier" /> <c>&lt;a16:rowId></c></description></item>
+    /// </list>
+    /// </remarks>
+    public partial class TableRowExtension : OpenXmlCompositeElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the TableRowExtension class.
+        /// </summary>
+        public TableRowExtension() : base()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableRowExtension class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableRowExtension(IEnumerable<OpenXmlElement> childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableRowExtension class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableRowExtension(params OpenXmlElement[] childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableRowExtension class from outer XML.
+        /// </summary>
+        /// <param name="outerXml">Specifies the outer XML of the element.</param>
+        public TableRowExtension(string outerXml) : base(outerXml)
+        {
+        }
+
+        internal override void ConfigureMetadata(ElementMetadata.Builder builder)
+        {
+            base.ConfigureMetadata(builder);
+            builder.SetSchema("a:ext");
+            builder.AddChild<DocumentFormat.OpenXml.Office2016.Drawing.RowIdIdentifier>();
+            builder.Particle = new CompositeParticle.Builder(ParticleType.Choice, 1, 1)
+            {
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Office2016.Drawing.RowIdIdentifier), 1, 1, version: FileFormatVersions.Office2016),
+                new AnyParticle(0, 1)
+            };
+        }
+
+        /// <inheritdoc/>
+        public override OpenXmlElement CloneNode(bool deep) => CloneImp<TableRowExtension>(deep);
+    }
+
+    /// <summary>
+    /// <para>Defines the TableColExtensionList Class.</para>
+    /// <para>This class is available in Office 2007 and above.</para>
+    /// <para>When the object is serialized out as xml, it's qualified name is a:extLst.</para>
+    /// </summary>
+    /// <remarks>
+    /// <para>The following table lists the possible child types:</para>
+    /// <list type="bullet">
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TableColExtension" /> <c>&lt;a:ext></c></description></item>
+    /// </list>
+    /// </remarks>
+    public partial class TableColExtensionList : OpenXmlCompositeElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the TableColExtensionList class.
+        /// </summary>
+        public TableColExtensionList() : base()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableColExtensionList class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableColExtensionList(IEnumerable<OpenXmlElement> childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableColExtensionList class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableColExtensionList(params OpenXmlElement[] childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableColExtensionList class from outer XML.
+        /// </summary>
+        /// <param name="outerXml">Specifies the outer XML of the element.</param>
+        public TableColExtensionList(string outerXml) : base(outerXml)
+        {
+        }
+
+        internal override void ConfigureMetadata(ElementMetadata.Builder builder)
+        {
+            base.ConfigureMetadata(builder);
+            builder.SetSchema("a:extLst");
+            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableColExtension>();
+            builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
+            {
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TableColExtension), 0, 0)
+            };
+        }
+
+        /// <inheritdoc/>
+        public override OpenXmlElement CloneNode(bool deep) => CloneImp<TableColExtensionList>(deep);
+    }
+
+    /// <summary>
+    /// <para>Defines the TableCell Class.</para>
+    /// <para>This class is available in Office 2007 and above.</para>
+    /// <para>When the object is serialized out as xml, it's qualified name is a:tc.</para>
+    /// </summary>
+    /// <remarks>
+    /// <para>The following table lists the possible child types:</para>
+    /// <list type="bullet">
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.ExtensionList" /> <c>&lt;a:extLst></c></description></item>
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TableCellProperties" /> <c>&lt;a:tcPr></c></description></item>
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TextBody" /> <c>&lt;a:txBody></c></description></item>
+    /// </list>
+    /// </remarks>
+    public partial class TableCell : OpenXmlCompositeElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the TableCell class.
+        /// </summary>
+        public TableCell() : base()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableCell class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableCell(IEnumerable<OpenXmlElement> childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableCell class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableCell(params OpenXmlElement[] childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableCell class from outer XML.
+        /// </summary>
+        /// <param name="outerXml">Specifies the outer XML of the element.</param>
+        public TableCell(string outerXml) : base(outerXml)
+        {
+        }
+
+        /// <summary>
+        /// <para>Row Span</para>
+        /// <para>Represents the following attribute in the schema: rowSpan</para>
+        /// </summary>
+        public Int32Value? RowSpan
+        {
+            get => GetAttribute<Int32Value>();
+            set => SetAttribute(value);
+        }
+
+        /// <summary>
+        /// <para>Grid Span</para>
+        /// <para>Represents the following attribute in the schema: gridSpan</para>
+        /// </summary>
+        public Int32Value? GridSpan
+        {
+            get => GetAttribute<Int32Value>();
+            set => SetAttribute(value);
+        }
+
+        /// <summary>
+        /// <para>Horizontal Merge</para>
+        /// <para>Represents the following attribute in the schema: hMerge</para>
+        /// </summary>
+        public BooleanValue? HorizontalMerge
+        {
+            get => GetAttribute<BooleanValue>();
+            set => SetAttribute(value);
+        }
+
+        /// <summary>
+        /// <para>Vertical Merge</para>
+        /// <para>Represents the following attribute in the schema: vMerge</para>
+        /// </summary>
+        public BooleanValue? VerticalMerge
+        {
+            get => GetAttribute<BooleanValue>();
+            set => SetAttribute(value);
+        }
+
+        internal override void ConfigureMetadata(ElementMetadata.Builder builder)
+        {
+            base.ConfigureMetadata(builder);
+            builder.SetSchema("a:tc");
+            builder.AddChild<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableCellProperties>();
+            builder.AddChild<DocumentFormat.OpenXml.Drawing.TextBody>();
+            builder.AddElement<TableCell>()
+                .AddAttribute("rowSpan", a => a.RowSpan)
+                .AddAttribute("gridSpan", a => a.GridSpan)
+                .AddAttribute("hMerge", a => a.HorizontalMerge)
+                .AddAttribute("vMerge", a => a.VerticalMerge);
+            builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
+            {
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TextBody), 0, 1),
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TableCellProperties), 0, 1),
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.ExtensionList), 0, 1)
+            };
+            builder.AddConstraint(new AttributeValueRangeConstraint(builder.CreateQName("a:rowSpan"), true, 1, true, double.PositiveInfinity, true));
+            builder.AddConstraint(new AttributeValueRangeConstraint(builder.CreateQName("a:gridSpan"), true, 1, true, double.PositiveInfinity, true));
+        }
+
+        /// <summary>
+        /// <para>Text Body.</para>
+        /// <para>Represents the following element tag in the schema: a:txBody.</para>
+        /// </summary>
+        /// <remarks>
+        /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main
+        /// </remarks>
+        public DocumentFormat.OpenXml.Drawing.TextBody? TextBody
+        {
+            get => GetElement<DocumentFormat.OpenXml.Drawing.TextBody>();
+            set => SetElement(value);
+        }
+
+        /// <summary>
+        /// <para>Table Cell Properties.</para>
+        /// <para>Represents the following element tag in the schema: a:tcPr.</para>
+        /// </summary>
+        /// <remarks>
+        /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main
+        /// </remarks>
+        public DocumentFormat.OpenXml.Drawing.TableCellProperties? TableCellProperties
+        {
+            get => GetElement<DocumentFormat.OpenXml.Drawing.TableCellProperties>();
+            set => SetElement(value);
+        }
+
+        /// <summary>
+        /// <para>ExtensionList.</para>
+        /// <para>Represents the following element tag in the schema: a:extLst.</para>
+        /// </summary>
+        /// <remarks>
+        /// xmlns:a = http://schemas.openxmlformats.org/drawingml/2006/main
+        /// </remarks>
+        public DocumentFormat.OpenXml.Drawing.ExtensionList? ExtensionList
+        {
+            get => GetElement<DocumentFormat.OpenXml.Drawing.ExtensionList>();
+            set => SetElement(value);
+        }
+
+        /// <inheritdoc/>
+        public override OpenXmlElement CloneNode(bool deep) => CloneImp<TableCell>(deep);
+    }
+
+    /// <summary>
+    /// <para>Defines the TableRowExtensionList Class.</para>
+    /// <para>This class is available in Office 2007 and above.</para>
+    /// <para>When the object is serialized out as xml, it's qualified name is a:extLst.</para>
+    /// </summary>
+    /// <remarks>
+    /// <para>The following table lists the possible child types:</para>
+    /// <list type="bullet">
+    ///   <item><description><see cref="DocumentFormat.OpenXml.Drawing.TableRowExtension" /> <c>&lt;a:ext></c></description></item>
+    /// </list>
+    /// </remarks>
+    public partial class TableRowExtensionList : OpenXmlCompositeElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the TableRowExtensionList class.
+        /// </summary>
+        public TableRowExtensionList() : base()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableRowExtensionList class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableRowExtensionList(IEnumerable<OpenXmlElement> childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableRowExtensionList class with the specified child elements.
+        /// </summary>
+        /// <param name="childElements">Specifies the child elements.</param>
+        public TableRowExtensionList(params OpenXmlElement[] childElements) : base(childElements)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the TableRowExtensionList class from outer XML.
+        /// </summary>
+        /// <param name="outerXml">Specifies the outer XML of the element.</param>
+        public TableRowExtensionList(string outerXml) : base(outerXml)
+        {
+        }
+
+        internal override void ConfigureMetadata(ElementMetadata.Builder builder)
+        {
+            base.ConfigureMetadata(builder);
+            builder.SetSchema("a:extLst");
+            builder.AddChild<DocumentFormat.OpenXml.Drawing.TableRowExtension>();
+            builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
+            {
+                new ElementParticle(typeof(DocumentFormat.OpenXml.Drawing.TableRowExtension), 0, 0)
+            };
+        }
+
+        /// <inheritdoc/>
+        public override OpenXmlElement CloneNode(bool deep) => CloneImp<TableRowExtensionList>(deep);
+    }
+
     /// <summary>
     /// <para>Defines the HyperlinkExtension Class.</para>
     /// <para>This class is available in Office 2007 and above.</para>
diff --git a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json
index daa8b453f..99bbba914 100644
--- a/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json
+++ b/test/DocumentFormat.OpenXml.Framework.Tests/ElementChildren.json
@@ -15633,6 +15633,24 @@
       }
     ]
   },
+  {
+    "Element": "DocumentFormat.OpenXml.Drawing.TableColExtension",
+    "Children": [
+      {
+        "Name": "colId",
+        "Namespace": "http://schemas.microsoft.com/office/drawing/2014/main"
+      }
+    ]
+  },
+  {
+    "Element": "DocumentFormat.OpenXml.Drawing.TableColExtensionList",
+    "Children": [
+      {
+        "Name": "ext",
+        "Namespace": "http://schemas.openxmlformats.org/drawingml/2006/main"
+      }
+    ]
+  },
   {
     "Element": "DocumentFormat.OpenXml.Drawing.TableGrid",
     "Children": [
@@ -15704,6 +15722,24 @@
       }
     ]
   },
+  {
+    "Element": "DocumentFormat.OpenXml.Drawing.TableRowExtension",
+    "Children": [
+      {
+        "Name": "rowId",
+        "Namespace": "http://schemas.microsoft.com/office/drawing/2014/main"
+      }
+    ]
+  },
+  {
+    "Element": "DocumentFormat.OpenXml.Drawing.TableRowExtensionList",
+    "Children": [
+      {
+        "Name": "ext",
+        "Namespace": "http://schemas.openxmlformats.org/drawingml/2006/main"
+      }
+    ]
+  },
   {
     "Element": "DocumentFormat.OpenXml.Drawing.TableStyle",
     "Children": [
diff --git a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json
index eb729d3ab..b186f1dcf 100644
--- a/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json
+++ b/test/DocumentFormat.OpenXml.Packaging.Tests/data/Particles.json
@@ -13294,7 +13294,7 @@
     "Value": {
      "ChildrenParticles": [
       {
-       "ElementType": "DocumentFormat.OpenXml.Drawing.ExtensionList",
+       "ElementType": "DocumentFormat.OpenXml.Drawing.TableColExtensionList",
        "MinOccurs": 0
       }
      ],
@@ -19773,6 +19773,56 @@
    }
   ]
  },
+ {
+  "Key": "DocumentFormat.OpenXml.Drawing.TableColExtension",
+  "Value": [
+   {
+    "Key": "Office2016, Office2019, Office2021, Microsoft365",
+    "Value": {
+     "ChildrenParticles": [
+      {
+       "ElementType": "DocumentFormat.OpenXml.Office2016.Drawing.ColIdIdentifier"
+      },
+      {
+       "MinOccurs": 0,
+       "ParticleType": "Any"
+      }
+     ],
+     "ParticleType": "Choice"
+    }
+   },
+   {
+    "Key": "Office2007, Office2010, Office2013",
+    "Value": {
+     "ChildrenParticles": [
+      {
+       "MinOccurs": 0,
+       "ParticleType": "Any"
+      }
+     ],
+     "ParticleType": "Choice"
+    }
+   }
+  ]
+ },
+ {
+  "Key": "DocumentFormat.OpenXml.Drawing.TableColExtensionList",
+  "Value": [
+   {
+    "Key": "Office2007, Office2010, Office2013, Office2016, Office2019, Office2021, Microsoft365",
+    "Value": {
+     "ChildrenParticles": [
+      {
+       "ElementType": "DocumentFormat.OpenXml.Drawing.TableColExtension",
+       "MaxOccurs": 0,
+       "MinOccurs": 0
+      }
+     ],
+     "ParticleType": "Sequence"
+    }
+   }
+  ]
+ },
  {
   "Key": "DocumentFormat.OpenXml.Drawing.TableGrid",
   "Value": [
@@ -19878,7 +19928,57 @@
        "MinOccurs": 0
       },
       {
-       "ElementType": "DocumentFormat.OpenXml.Drawing.ExtensionList",
+       "ElementType": "DocumentFormat.OpenXml.Drawing.TableRowExtensionList",
+       "MinOccurs": 0
+      }
+     ],
+     "ParticleType": "Sequence"
+    }
+   }
+  ]
+ },
+ {
+  "Key": "DocumentFormat.OpenXml.Drawing.TableRowExtension",
+  "Value": [
+   {
+    "Key": "Office2016, Office2019, Office2021, Microsoft365",
+    "Value": {
+     "ChildrenParticles": [
+      {
+       "ElementType": "DocumentFormat.OpenXml.Office2016.Drawing.RowIdIdentifier"
+      },
+      {
+       "MinOccurs": 0,
+       "ParticleType": "Any"
+      }
+     ],
+     "ParticleType": "Choice"
+    }
+   },
+   {
+    "Key": "Office2007, Office2010, Office2013",
+    "Value": {
+     "ChildrenParticles": [
+      {
+       "MinOccurs": 0,
+       "ParticleType": "Any"
+      }
+     ],
+     "ParticleType": "Choice"
+    }
+   }
+  ]
+ },
+ {
+  "Key": "DocumentFormat.OpenXml.Drawing.TableRowExtensionList",
+  "Value": [
+   {
+    "Key": "Office2007, Office2010, Office2013, Office2016, Office2019, Office2021, Microsoft365",
+    "Value": {
+     "ChildrenParticles": [
+      {
+       "ElementType": "DocumentFormat.OpenXml.Drawing.TableRowExtension",
+       "MaxOccurs": 0,
        "MinOccurs": 0
       }
      ],