diff --git a/fabric/item/plan/definition/PowerTable/Approvals/1.0.0/schema.json b/fabric/item/plan/definition/PowerTable/Approvals/1.0.0/schema.json
index 3f4711f1..d8196006 100644
--- a/fabric/item/plan/definition/PowerTable/Approvals/1.0.0/schema.json
+++ b/fabric/item/plan/definition/PowerTable/Approvals/1.0.0/schema.json
@@ -6,7 +6,13 @@
 	"type": "object",
 	"required": [
 		"$schema",
-		"ruleType"
+		"ruleType",
+		"persistFlag",
+		"approvalLevel",
+		"multiLevelEnabled",
+		"approvalLevels",
+		"approvalFilter",
+		"recordGuid"
 	],
 	"properties": {
 		"$schema": {
@@ -39,6 +45,10 @@
 				1
 			]
 		},
+		"recordGuid": {
+			"type": "string",
+			"format": "uuid"
+		},
 		"approvalLevels": {
 			"type": "array",
 			"description": "Configured approval levels.",
@@ -61,7 +71,8 @@
 			"required": [
 				"name",
 				"description",
-				"level"
+				"level",
+				"recordGuid"
 			],
 			"properties": {
 				"name": {
@@ -73,6 +84,10 @@
 				"level": {
 					"type": "integer",
 					"minimum": 1
+				},
+				"recordGuid": {
+					"type": "string",
+					"format": "uuid"
 				}
 			},
 			"additionalProperties": false
@@ -82,7 +97,8 @@
 			"required": [
 				"name",
 				"filter",
-				"order"
+				"order",
+				"recordGuid"
 			],
 			"properties": {
 				"name": {
@@ -98,6 +114,10 @@
 				"order": {
 					"type": "integer",
 					"minimum": 0
+				},
+				"recordGuid": {
+					"type": "string",
+					"format": "uuid"
 				}
 			},
 			"additionalProperties": false
diff --git a/fabric/item/plan/definition/PowerTable/Automations/1.0.0/schema.json b/fabric/item/plan/definition/PowerTable/Automations/1.0.0/schema.json
index ba26dbf5..3ef4e99f 100644
--- a/fabric/item/plan/definition/PowerTable/Automations/1.0.0/schema.json
+++ b/fabric/item/plan/definition/PowerTable/Automations/1.0.0/schema.json
@@ -6,7 +6,8 @@
   "type": "object",
   "required": [
     "$schema",
-    "automations"
+    "automations",
+    "recordGuid"
   ],
   "properties": {
     "$schema": {
@@ -28,7 +29,8 @@
       "required": [
         "name",
         "triggerType",
-        "config"
+        "config",
+        "recordGuid"
       ],
       "properties": {
         "name": {
@@ -41,6 +43,10 @@
         },
         "config": {
           "$ref": "#/definitions/AutomationConfig"
+        },
+        "recordGuid": {
+          "type": "string",
+          "format": "uuid"
         }
       },
       "additionalProperties": false
diff --git a/fabric/item/plan/definition/PowerTable/ColumnConfigs/1.0.0/schema.json b/fabric/item/plan/definition/PowerTable/ColumnConfigs/1.0.0/schema.json
index 1dfec671..cd2d893f 100644
--- a/fabric/item/plan/definition/PowerTable/ColumnConfigs/1.0.0/schema.json
+++ b/fabric/item/plan/definition/PowerTable/ColumnConfigs/1.0.0/schema.json
@@ -16,7 +16,12 @@
         "columnName",
         "columnType",
         "columnMeta",
-        "displayName"
+        "displayName",
+        "hideColumn",
+        "mandatory",
+        "allowEdit",
+        "visualColumnType",
+        "recordGuid"
       ],
       "properties": {
         "$schema": {
@@ -73,6 +78,10 @@
         },
         "description": {
           "type": "string"
+        },
+        "recordGuid": {
+          "type": "string",
+          "format": "uuid"
         }
       },
       "additionalProperties": false
diff --git a/fabric/item/plan/definition/PowerTable/Forms/1.0.0/schema.json b/fabric/item/plan/definition/PowerTable/Forms/1.0.0/schema.json
index 1f12465d..d1426545 100644
--- a/fabric/item/plan/definition/PowerTable/Forms/1.0.0/schema.json
+++ b/fabric/item/plan/definition/PowerTable/Forms/1.0.0/schema.json
@@ -13,7 +13,9 @@
       "required": [
         "$schema",
         "title",
-        "layoutMeta"
+        "layoutMeta",
+        "config",
+        "recordGuid"
       ],
       "properties": {
         "$schema": {
@@ -33,6 +35,10 @@
         },
         "config": {
           "$ref": "#/definitions/FormConfig"
+        },
+        "recordGuid": {
+          "type": "string",
+          "format": "uuid"
         }
       },
       "additionalProperties": false
@@ -72,48 +78,31 @@
       },
       "additionalProperties": false
     },
-    "FormElement": {
+    "formFields": {
       "type": "object",
       "required": [
-        "type",
-        "name"
+        "recordGuid",
+        "required",
+        "columnConfigId"
       ],
       "properties": {
-        "type": {
-          "type": "string",
-          "description": "Element type.",
-          "enum": [
-            "field",
-            "section",
-            "tab"
-          ]
-        },
-        "name": {
+        "description": {
           "type": "string",
           "description": "Field/column name."
         },
-        "mandatory": {
+        "required": {
           "type": "integer",
           "enum": [
             0,
             1
           ]
         },
-        "allowEdit": {
-          "type": "integer",
-          "enum": [
-            0,
-            1
-          ]
+        "defaultValue": {
+          "type": "string"
         },
-        "props": {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            }
-          },
-          "additionalProperties": true
+        "columnConfigId": {
+          "type": "string",
+          "format": "uuid"
         }
       },
       "additionalProperties": false
diff --git a/fabric/item/plan/definition/PowerTable/Source/1.0.0/schema.json b/fabric/item/plan/definition/PowerTable/Source/1.0.0/schema.json
index 2a9b6047..c1165c50 100644
--- a/fabric/item/plan/definition/PowerTable/Source/1.0.0/schema.json
+++ b/fabric/item/plan/definition/PowerTable/Source/1.0.0/schema.json
@@ -6,10 +6,21 @@
   "type": "object",
   "required": [
     "$schema",
-    "connection",
     "tableName",
     "schema",
-    "database"
+    "recordGuid"
+  ],
+  "anyOf": [
+    {
+      "required": [
+        "connectionId", "dbHost", "dbName"
+      ]
+    },
+    {
+      "required": [
+        "connectionVariable", "databaseVariable"
+      ]
+    }
   ],
   "properties": {
     "$schema": {
@@ -17,10 +28,20 @@
       "format": "uri",
       "const": "https://developer.microsoft.com/json-schemas/fabric/item/plan/definition/powerTable/source/1.0.0/schema.json"
     },
-    "connection": {
+    "connectionId": {
+      "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/connectionReference/1.0.0/schema.json#/definitions/ConnectionReferenceOrVar",
+      "format": "uuid"
+    },
+    "dbHost": {
+      "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/itemReference/1.0.0/schema.json#/definitions/ItemReferenceOrVar"
+    },
+    "dbName": {
+      "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/itemReference/1.0.0/schema.json#/definitions/ItemReferenceOrVar"
+    },
+    "connectionIdVariable": {
       "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/connectionReference/1.0.0/schema.json#/definitions/ConnectionReferenceOrVar"
     },
-    "database": {
+    "databaseVariable": {
       "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/itemReference/1.0.0/schema.json#/definitions/ItemReferenceOrVar"
     },
     "schema": {
@@ -28,6 +49,10 @@
     },
     "tableName": {
       "type": "string"
+    },
+    "recordGuid": {
+      "type": "string",
+      "format": "uuid"
     }
   },
   "additionalProperties": false