diff --git a/forward_engineering/helpers/awsCliScriptHelpers/glueTableHelper.js b/forward_engineering/helpers/awsCliScriptHelpers/glueTableHelper.js
index 25f8cd1..d85988c 100644
--- a/forward_engineering/helpers/awsCliScriptHelpers/glueTableHelper.js
+++ b/forward_engineering/helpers/awsCliScriptHelpers/glueTableHelper.js
@@ -20,9 +20,13 @@ const getGlueTableCreateStatement = (tableSchema, databaseName) => {
 				OutputFormat: tableSchema.outputFormatClassname,
 				Compressed: tableSchema.compressed,
 				NumberOfBuckets: tableSchema.numBuckets,
-				SerdeInfo: mapSerdeInfo(tableSchema),
-				BucketColumns: getGlueTableClusteringKeyColumns(tableSchema.properties),
-				SortColumns: getGlueTableSortingColumns(tableSchema.sortedByKey, tableSchema.properties),
+				SerdeInfo: handleParameterByTableFormat(tableSchema, () => mapSerdeInfo(tableSchema)),
+				BucketColumns: handleParameterByTableFormat(tableSchema, () =>
+					getGlueTableClusteringKeyColumns(tableSchema.properties),
+				),
+				SortColumns: handleParameterByTableFormat(tableSchema, () =>
+					getGlueTableSortingColumns(tableSchema.sortedByKey, tableSchema.properties),
+				),
 				StoredAsSubDirectories: tableSchema.StoredAsSubDirectories,
 			},
 			Parameters: mapTableParameters(tableSchema),
diff --git a/properties_pane/defaultData.json b/properties_pane/defaultData.json
index 44daca2..16f02a8 100644
--- a/properties_pane/defaultData.json
+++ b/properties_pane/defaultData.json
@@ -12,7 +12,17 @@
 		"collectionName": "new_table",
 		"collectionUsers": [],
 		"collation": {},
-		"storedAsTable": "input/output format"
+		"storedAsTable": {
+			"valueDependencies": [
+				{
+					"value": "input/output format",
+					"dependency": {
+						"key": "tableFormat",
+						"value": "Standard"
+					}
+				}
+			]
+		}
 	},
 	"field": {
 		"name": "new_column"