diff --git a/Projects/Foundations/UI/Function-Libraries/ChartingSpaceFunctions.js b/Projects/Foundations/UI/Function-Libraries/ChartingSpaceFunctions.js
index bbd74b0a3..c6c5808c9 100644
--- a/Projects/Foundations/UI/Function-Libraries/ChartingSpaceFunctions.js
+++ b/Projects/Foundations/UI/Function-Libraries/ChartingSpaceFunctions.js
@@ -340,6 +340,8 @@ function newFoundationsFunctionLibraryChartingSpaceFunctions() {
             let projectDefinition = PROJECTS_SCHEMA[k]
             let project = projectDefinition.name
 
+            if (projectDefinition.products === undefined) { continue }
+
             for (let j = 0; j < rootNodes.length; j++) {
                 let rootNode = rootNodes[j]
                 if (rootNode.type === project + ' Project') {
diff --git a/Projects/Foundations/UI/Function-Libraries/DataStorageFunctions.js b/Projects/Foundations/UI/Function-Libraries/DataStorageFunctions.js
index b2e6a086f..7bf27bfe0 100644
--- a/Projects/Foundations/UI/Function-Libraries/DataStorageFunctions.js
+++ b/Projects/Foundations/UI/Function-Libraries/DataStorageFunctions.js
@@ -233,6 +233,9 @@ function newFoundationsFunctionLibraryDataStorageFunctions() {
             let projectDefinition = PROJECTS_SCHEMA[k]
             let project = projectDefinition.name
 
+            if (projectDefinition.products === undefined) { continue }
+            if (projectDefinition.products.includes(newNodeType.replace('Project ', '')) === false) { continue }
+
             for (let j = 0; j < rootNodes.length; j++) {
                 let rootNode = rootNodes[j]
                 if (rootNode.type === project + ' Project') {
diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json
index ae089280b..a8544b17a 100644
--- a/Projects/ProjectsSchema.json
+++ b/Projects/ProjectsSchema.json
@@ -839,6 +839,11 @@
         "plugins": [
             "Tutorials",
             "API Maps"
+        ],
+        "products": [
+            "Data Products",
+            "Trading Products",
+            "Learning Products"
         ]
     },
     {