diff --git a/compiler/components/grid_col.json b/compiler/components/grid_col.json
new file mode 100644
index 0000000..710be95
--- /dev/null
+++ b/compiler/components/grid_col.json
@@ -0,0 +1,6 @@
+{
+    "name": "GridCol",
+    "parents": ["GridRow"],
+    "single": true,
+    "attrs": []
+}
\ No newline at end of file
diff --git a/compiler/components/grid_row.json b/compiler/components/grid_row.json
new file mode 100644
index 0000000..9e67ac6
--- /dev/null
+++ b/compiler/components/grid_row.json
@@ -0,0 +1,7 @@
+{
+    "name": "GridRow",
+    "children": ["GridCol"],
+    "attrs": [
+      "verticalAlign", "horizontalAlign", "onBreakpointChange"
+    ]
+}
\ No newline at end of file
diff --git a/compiler/tsconfig.esm.json b/compiler/tsconfig.esm.json
index f159b95..9a8dab2 100644
--- a/compiler/tsconfig.esm.json
+++ b/compiler/tsconfig.esm.json
@@ -93,7 +93,9 @@
         "Toggle",
         "Video",
         "Web",
-        "XComponent"
+        "XComponent",
+        "GridRow",
+        "GridCol"
       ],
       "extend": {
         "decorator": "Extend",
@@ -533,6 +535,16 @@
             "type": "XComponentAttribute",
             "instance": "XComponentInstance"
           },
+          {
+            "name": "GridRow",
+            "type": "GridRowAttribute",
+            "instance": "GridRowInterface"
+          },
+          {
+            "name": "GridCol",
+            "type": "GridColAttribute",
+            "instance": "GridColInterface"
+          }
         ]
       },
       "styles": {
diff --git a/compiler/tsconfig.json b/compiler/tsconfig.json
index ec8cfec..0c4cacd 100644
--- a/compiler/tsconfig.json
+++ b/compiler/tsconfig.json
@@ -93,7 +93,9 @@
         "Toggle",
         "Video",
         "Web",
-        "XComponent"
+        "XComponent",
+        "GridRow",
+        "GridCol"
       ],
       "extend": {
         "decorator": "Extend",
@@ -533,6 +535,16 @@
             "type": "XComponentAttribute",
             "instance": "XComponentInstance"
           },
+          {
+            "name": "GridRow",
+            "type": "GridRowAttribute",
+            "instance": "GridRowInterface"
+          },
+          {
+            "name": "GridCol",
+            "type": "GridColAttribute",
+            "instance": "GridColInterface"
+          }
         ]
       },
       "styles": {