diff --git a/component-definition.json b/component-definition.json
index 75022c93ef..a2a9022062 100644
--- a/component-definition.json
+++ b/component-definition.json
@@ -115,7 +115,23 @@
                 "resourceType": "core/franklin/components/block/v1/block",
                 "template": {
                   "name": "Table",
-                  "model": "table"
+                  "model": "table",
+                  "filter": "table"
+                }
+              }
+            }
+          }
+        },
+        {
+          "title": "Row",
+          "id": "row",
+          "plugins": {
+            "xwalk": {
+              "page": {
+                "resourceType": "core/franklin/components/block/v1/block/item",
+                "template": {
+                  "name": "Row",
+                  "model": "row"
                 }
               }
             }
diff --git a/component-filters.json b/component-filters.json
index 5091020955..d4c3698f26 100644
--- a/component-filters.json
+++ b/component-filters.json
@@ -115,6 +115,10 @@
     "id": "cards",
     "components": ["card"]
   },
+  {
+    "id": "table",
+    "components": ["row"]
+  },
   {
     "id": "carousel",
     "components": [
diff --git a/component-models.json b/component-models.json
index 62962cd2a4..506e6c4875 100644
--- a/component-models.json
+++ b/component-models.json
@@ -261,6 +261,25 @@
       }
     ]
   },
+  {
+    "id": "row",
+    "fields": [
+      {
+        "component": "text",
+        "valueType": "number",
+        "label": "Rows",
+        "name": "rows",
+        "value": ""
+      },
+      {
+        "component": "text",
+        "valueType": "number",
+        "label": "Columns",
+        "name": "columns",
+        "value": ""
+      }
+    ]
+  },
   {
     "id": "breadcrumb",
     "fields": [