diff --git a/properties_pane/container_level/containerLevelConfig.json b/properties_pane/container_level/containerLevelConfig.json
index bb3f7b0..cd78f4d 100644
--- a/properties_pane/container_level/containerLevelConfig.json
+++ b/properties_pane/container_level/containerLevelConfig.json
@@ -170,59 +170,11 @@ making sure that you maintain a proper JSON format.
 			},
 			{
 				"propertyName": "Directives",
-				"propertyKeyword": "directives",
-				"propertyTooltip": "",
-				"propertyType": "group",
-				"structure": [
-					{
-						"propertyName": "Directive",
-						"propertyKeyword": "directive",
-						"propertyTooltip": "",
-						"propertyType": "text"
-					},
-					{
-						"propertyName": "Description",
-						"propertyKeyword": "description",
-						"propertyTooltip": "Popup for multi-line text entry",
-						"propertyType": "details",
-						"template": "textarea"
-					},
-					{
-						"propertyName": "Arguments",
-						"propertyKeyword": "arguments",
-						"propertyTooltip": "Popup for multi-line text entry",
-						"propertyType": "details",
-						"template": "textarea",
-						"markdown": false
-					},
-					{
-						"propertyName": "Applicable elements",
-						"propertyKeyword": "dropdownProp",
-						"propertyTooltip": "Select from list of options",
-						"propertyType": "multipleCheckboxSelect",
-						"options": [
-							"ARGUMENT_DEFINITION",
-							"ENUM",
-							"ENUM_VALUE",
-							"FIELD",
-							"FIELD_DEFINITION",
-							"FRAGMENT_DEFINITION",
-							"FRAGMENT_SPREAD",
-							"INLINE_FRAGMENT",
-							"INPUT_FIELD_DEFINITION",
-							"INPUT_OBJECT",
-							"INTERFACE",
-							"MUTATION",
-							"OBJECT",
-							"QUERY",
-							"SCALAR",
-							"SCHEMA",
-							"SUBSCRIPTION",
-							"UNION",
-							"VARIABLE_DEFINITION"
-						]
-					}
-				]
+				"propertyKeyword": "directive",
+				"propertyTooltip": "Schema directives",
+				"propertyType": "details",
+				"template": "textarea",
+				"markdown": false
 			},
 			{
 				"propertyName": "Comments",
diff --git a/properties_pane/field_level/fieldLevelConfig.json b/properties_pane/field_level/fieldLevelConfig.json
index 88b73b4..86b639d 100644
--- a/properties_pane/field_level/fieldLevelConfig.json
+++ b/properties_pane/field_level/fieldLevelConfig.json
@@ -143,9 +143,9 @@ making sure that you maintain a proper JSON format.
 				"markdown": false
 			},
 			{
-				"propertyName": "Directive",
+				"propertyName": "Directives",
 				"propertyKeyword": "directive",
-				"propertyTooltip": "Popup for multi-line text entry",
+				"propertyTooltip": "Field directives",
 				"propertyType": "details",
 				"template": "textarea",
 				"markdown": false
@@ -186,9 +186,9 @@ making sure that you maintain a proper JSON format.
 				"markdown": false
 			},
 			{
-				"propertyName": "Directive",
+				"propertyName": "Directives",
 				"propertyKeyword": "directive",
-				"propertyTooltip": "Popup for multi-line text entry",
+				"propertyTooltip": "Field directives",
 				"propertyType": "details",
 				"template": "textarea",
 				"markdown": false
@@ -231,9 +231,9 @@ making sure that you maintain a proper JSON format.
 				"markdown": false
 			},
 			{
-				"propertyName": "Directive",
+				"propertyName": "Directives",
 				"propertyKeyword": "directive",
-				"propertyTooltip": "Popup for multi-line text entry",
+				"propertyTooltip": "Field directives",
 				"propertyType": "details",
 				"template": "textarea",
 				"markdown": false
@@ -274,9 +274,9 @@ making sure that you maintain a proper JSON format.
 				"markdown": false
 			},
 			{
-				"propertyName": "Directive",
+				"propertyName": "Directives",
 				"propertyKeyword": "directive",
-				"propertyTooltip": "Popup for multi-line text entry",
+				"propertyTooltip": "Field directives",
 				"propertyType": "details",
 				"template": "textarea",
 				"markdown": false
@@ -317,9 +317,9 @@ making sure that you maintain a proper JSON format.
 				"markdown": false
 			},
 			{
-				"propertyName": "Directive",
+				"propertyName": "Directives",
 				"propertyKeyword": "directive",
-				"propertyTooltip": "Popup for multi-line text entry",
+				"propertyTooltip": "Field directives",
 				"propertyType": "details",
 				"template": "textarea",
 				"markdown": false
@@ -394,12 +394,94 @@ making sure that you maintain a proper JSON format.
 				"hidden": true
 			}
 		],
-		"scalar": ["name", "description", "comments"],
-		"enum": ["name", "enum", "description", "comments"],
-		"object": ["name", "description", "required", "minProperties", "maxProperties", "comments"],
-		"interface": ["name", "description", "required", "minProperties", "maxProperties", "comments"],
-		"union": ["name", "description", "required", "comments"],
-		"input": ["name", "description", "required", "comments"],
+		"scalar": [
+			"name",
+			"description",
+			{
+				"propertyName": "Directives",
+				"propertyKeyword": "directive",
+				"propertyTooltip": "Scalar directives",
+				"propertyType": "details",
+				"template": "textarea",
+				"markdown": false
+			},
+			"comments"
+		],
+		"enum": [
+			"name",
+			"enum",
+			"description",
+			"required",
+			{
+				"propertyName": "Directives",
+				"propertyKeyword": "directive",
+				"propertyTooltip": "Enum directives",
+				"propertyType": "details",
+				"template": "textarea",
+				"markdown": false
+			},
+			"comments"
+		],
+		"object": [
+			"name",
+			"description",
+			"required",
+			{
+				"propertyName": "Directives",
+				"propertyKeyword": "directive",
+				"propertyTooltip": "Object directives",
+				"propertyType": "details",
+				"template": "textarea",
+				"markdown": false
+			},
+			"minProperties",
+			"maxProperties",
+			"comments"
+		],
+		"interface": [
+			"name",
+			"description",
+			"required",
+			{
+				"propertyName": "Directives",
+				"propertyKeyword": "directive",
+				"propertyTooltip": "Interface directives",
+				"propertyType": "details",
+				"template": "textarea",
+				"markdown": false
+			},
+			"minProperties",
+			"maxProperties",
+			"comments"
+		],
+		"union": [
+			"name",
+			"description",
+			"required",
+			{
+				"propertyName": "Directives",
+				"propertyKeyword": "directive",
+				"propertyTooltip": "Union directives",
+				"propertyType": "details",
+				"template": "textarea",
+				"markdown": false
+			},
+			"comments"
+		],
+		"input": [
+			"name",
+			"description",
+			"required",
+			{
+				"propertyName": "Directives",
+				"propertyKeyword": "directive",
+				"propertyTooltip": "Input directives",
+				"propertyType": "details",
+				"template": "textarea",
+				"markdown": false
+			},
+			"comments"
+		],
 		"directive": [
 			"name",
 			"description",