diff --git a/PostLoader.js b/PostLoader.js
index f8e8307ef..45775dee7 100644
--- a/PostLoader.js
+++ b/PostLoader.js
@@ -5,6 +5,8 @@ let APP_SCHEMA_MAP = new Map()
 let APP_SCHEMA_ARRAY = []
 let DOC_SCHEMA_MAP = new Map()
 let DOC_SCHEMA_ARRAY = []
+let CONCEPT_SCHEMA_MAP = new Map()
+let CONCEPT_SCHEMA_ARRAY = []
 
 function newDashboard() {
     const MODULE_NAME = 'Dashboard'
@@ -39,6 +41,12 @@ function newDashboard() {
                     let key = nodeDefinition.type
                     DOC_SCHEMA_MAP.set(key, nodeDefinition)
                 }
+                CONCEPT_SCHEMA_ARRAY = getConceptSchema()
+                for (let i = 0; i < CONCEPT_SCHEMA_ARRAY.length; i++) {
+                    let nodeDefinition = CONCEPT_SCHEMA_ARRAY[i]
+                    let key = nodeDefinition.type
+                    CONCEPT_SCHEMA_MAP.set(key, nodeDefinition)
+                }
                 startCanvas()
             }
 
diff --git a/Spaces/TutorialSpace.js b/Spaces/TutorialSpace.js
index 7d46e1a5a..bf9537ed8 100644
--- a/Spaces/TutorialSpace.js
+++ b/Spaces/TutorialSpace.js
@@ -910,8 +910,11 @@ function newTutorialSpace() {
                 }
                 let definitionNode = DOC_SCHEMA_MAP.get(nodeType)
                 if (definitionNode === undefined) {
-                    currentNode.payload.uiObject.setErrorMessage(nodeType + ' not found at Doc Schema.')
-                    return
+                    definitionNode = CONCEPT_SCHEMA_MAP.get(nodeType)
+                    if (definitionNode === undefined) {
+                        currentNode.payload.uiObject.setErrorMessage(nodeType + ' not found at Doc Schema or Concept Schema.')
+                        return
+                    }                    
                 }
                 let definition = definitionNode.definition
                 if (definition === undefined || definition === "") {