diff --git a/package.json b/package.json
index bf34699..58a582c 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
     "version": "0.2.33",
     "author": "hackolade",
     "engines": {
-        "hackolade": "6.8.4",
+        "hackolade": "8.13.7",
         "hackoladePlugin": "1.2.0"
     },
     "contributes": {
@@ -92,4 +92,4 @@
         },
         "minimatch": "10.2.6"
     }
-}
\ No newline at end of file
+}
diff --git a/properties_pane/entity_level/entityLevelConfig.json b/properties_pane/entity_level/entityLevelConfig.json
index 63db8dc..c34587d 100644
--- a/properties_pane/entity_level/entityLevelConfig.json
+++ b/properties_pane/entity_level/entityLevelConfig.json
@@ -271,8 +271,12 @@ making sure that you maintain a proper JSON format.
 			{
 				"propertyName": "Partition by",
 				"propertyKeyword": "timeUnitpartitionKey",
-				"propertyType": "primaryKeySetter",
+				"propertyType": "compositeKeySetter",
+				"disabledItemStrategy": "default",
 				"abbr": "PK",
+				"setPrimaryKey": false,
+				"template": "collectiontree",
+				"isCompositeKey": true,
 				"templateOptions": {
 					"maxFields": 4
 				},
@@ -303,8 +307,12 @@ making sure that you maintain a proper JSON format.
 					{
 						"propertyName": "Partition by",
 						"propertyKeyword": "rangePartitionKey",
-						"propertyType": "primaryKeySetter",
+						"propertyType": "compositeKeySetter",
+						"disabledItemStrategy": "default",
 						"abbr": "PK",
+						"setPrimaryKey": false,
+						"template": "collectiontree",
+						"isCompositeKey": true,
 						"templateOptions": {
 							"maxFields": 4
 						}
diff --git a/properties_pane/field_level/fieldLevelConfig.json b/properties_pane/field_level/fieldLevelConfig.json
index 56a136e..6f5b15f 100644
--- a/properties_pane/field_level/fieldLevelConfig.json
+++ b/properties_pane/field_level/fieldLevelConfig.json
@@ -113,14 +113,6 @@ making sure that you maintain a proper JSON format.
 					"disabledOnCondition": {
 						"type": "or",
 						"values": [
-							{
-								"key": "timeUnitpartitionKey",
-								"value": true
-							},
-							{
-								"key": "rangePartitionKey",
-								"value": true
-							},
 							{
 								"level": "siblings",
 								"key": "compositePrimaryKey",
@@ -408,14 +400,6 @@ making sure that you maintain a proper JSON format.
 					"disabledOnCondition": {
 						"type": "or",
 						"values": [
-							{
-								"key": "timeUnitpartitionKey",
-								"value": true
-							},
-							{
-								"key": "rangePartitionKey",
-								"value": true
-							},
 							{
 								"level": "siblings",
 								"key": "compositePrimaryKey",
@@ -611,14 +595,6 @@ making sure that you maintain a proper JSON format.
 					"disabledOnCondition": {
 						"type": "or",
 						"values": [
-							{
-								"key": "timeUnitpartitionKey",
-								"value": true
-							},
-							{
-								"key": "rangePartitionKey",
-								"value": true
-							},
 							{
 								"level": "siblings",
 								"key": "compositePrimaryKey",
@@ -814,14 +790,6 @@ making sure that you maintain a proper JSON format.
 					"disabledOnCondition": {
 						"type": "or",
 						"values": [
-							{
-								"key": "timeUnitpartitionKey",
-								"value": true
-							},
-							{
-								"key": "rangePartitionKey",
-								"value": true
-							},
 							{
 								"level": "siblings",
 								"key": "compositePrimaryKey",
@@ -1032,14 +1000,6 @@ making sure that you maintain a proper JSON format.
 					"disabledOnCondition": {
 						"type": "or",
 						"values": [
-							{
-								"key": "timeUnitpartitionKey",
-								"value": true
-							},
-							{
-								"key": "rangePartitionKey",
-								"value": true
-							},
 							{
 								"level": "siblings",
 								"key": "compositePrimaryKey",
@@ -1208,14 +1168,6 @@ making sure that you maintain a proper JSON format.
 					"disabledOnCondition": {
 						"type": "or",
 						"values": [
-							{
-								"key": "timeUnitpartitionKey",
-								"value": true
-							},
-							{
-								"key": "rangePartitionKey",
-								"value": true
-							},
 							{
 								"level": "siblings",
 								"key": "compositePrimaryKey",
@@ -1492,14 +1444,6 @@ making sure that you maintain a proper JSON format.
 					"disabledOnCondition": {
 						"type": "or",
 						"values": [
-							{
-								"key": "timeUnitpartitionKey",
-								"value": true
-							},
-							{
-								"key": "rangePartitionKey",
-								"value": true
-							},
 							{
 								"level": "siblings",
 								"key": "compositePrimaryKey",
@@ -1671,14 +1615,6 @@ making sure that you maintain a proper JSON format.
 					"disabledOnCondition": {
 						"type": "or",
 						"values": [
-							{
-								"key": "timeUnitpartitionKey",
-								"value": true
-							},
-							{
-								"key": "rangePartitionKey",
-								"value": true
-							},
 							{
 								"level": "siblings",
 								"key": "compositePrimaryKey",
diff --git a/properties_pane/view_level/viewLevelConfig.json b/properties_pane/view_level/viewLevelConfig.json
index b4f5c17..b72315a 100644
--- a/properties_pane/view_level/viewLevelConfig.json
+++ b/properties_pane/view_level/viewLevelConfig.json
@@ -98,8 +98,12 @@
 			{
 				"propertyName": "Partition by",
 				"propertyKeyword": "timeUnitpartitionKey",
-				"propertyType": "primaryKeySetter",
+				"propertyType": "compositeKeySetter",
+				"disabledItemStrategy": "default",
 				"abbr": "PK",
+				"setPrimaryKey": false,
+				"template": "collectiontree",
+				"isCompositeKey": true,
 				"templateOptions": {
 					"maxFields": 4
 				},
@@ -127,9 +131,12 @@
 					{
 						"propertyName": "Partition by",
 						"propertyKeyword": "rangePartitionKey",
-						"propertyType": "fieldList",
-						"template": "orderedList",
+						"propertyType": "compositeKeySetter",
+						"disabledItemStrategy": "default",
 						"abbr": "PK",
+						"setPrimaryKey": false,
+						"template": "collectiontree",
+						"isCompositeKey": true,
 						"templateOptions": {
 							"maxFields": 4
 						}