diff --git a/wax-prosemirror-services/src/EssayService/EssayService.js b/wax-prosemirror-services/src/EssayService/EssayService.js
index ed1e46693aae13372d7aacb1efa70a41345bb333..be7bd38ff191131b224a0c4edcc6df928347f859 100644
--- a/wax-prosemirror-services/src/EssayService/EssayService.js
+++ b/wax-prosemirror-services/src/EssayService/EssayService.js
@@ -1,6 +1,8 @@
 import Service from '../Service';
 import EssayQuestion from './EssayQuestion';
-import essayNode from './schema/essayNode';
+import essayContainerNode from './schema/essayContainerNode';
+import essayQuestionNode from './schema/essayQuestionNode';
+import essayFeedBackNode from './schema/essayFeedBackNode';
 import EssayComponent from './components/EssayComponent';
 import EssayNodeView from './EssayNodeView';
 
@@ -11,7 +13,15 @@ class EssayService extends Service {
     const addPortal = this.container.get('AddPortal');
 
     createNode({
-      essay: essayNode,
+      essay_container: essayContainerNode,
+    });
+
+    createNode({
+      essay_question: essayQuestionNode,
+    });
+
+    createNode({
+      essay_feedback: essayFeedBackNode,
     });
 
     addPortal({
diff --git a/wax-prosemirror-services/src/EssayService/schema/essayNode.js b/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
similarity index 84%
rename from wax-prosemirror-services/src/EssayService/schema/essayNode.js
rename to wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
index 257009cb8529d99fd27c39343e60894a054f5890..72f12448c30df37ab51b8eb8851148a35a4ca56d 100644
--- a/wax-prosemirror-services/src/EssayService/schema/essayNode.js
+++ b/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
@@ -1,9 +1,10 @@
-const essayNode = {
+const essayContainerNode = {
   attrs: {
-    class: { default: 'essay' },
     id: { default: '' },
+    class: { default: 'essay' },
   },
   group: 'block questions',
+  atom: true,
   selectable: true,
   draggable: true,
   content: 'block+',
@@ -23,4 +24,4 @@ const essayNode = {
   },
 };
 
-export default essayNode;
+export default essayContainerNode;
diff --git a/wax-prosemirror-services/src/EssayService/schema/essayFeedBackNode.js b/wax-prosemirror-services/src/EssayService/schema/essayFeedBackNode.js
new file mode 100644
index 0000000000000000000000000000000000000000..227917bb1ff922f3fd42982fc5e50c65bffa21b3
--- /dev/null
+++ b/wax-prosemirror-services/src/EssayService/schema/essayFeedBackNode.js
@@ -0,0 +1,3 @@
+const essayFeedBackNode = {};
+
+export default essayFeedBackNode;
diff --git a/wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js b/wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js
new file mode 100644
index 0000000000000000000000000000000000000000..dcbd7868387ac5f273131f4be34c14b6c20bc9f9
--- /dev/null
+++ b/wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js
@@ -0,0 +1,3 @@
+const essayQuestionNode = {};
+
+export default essayQuestionNode;
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index a538c33cf0bb9b5e812e231572b2064afe629704..b828697d3612c41a0932212ed96a77e88e8321d8 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -10,7 +10,8 @@ const multipleChoiceNode = {
   group: 'block questions',
   content: 'block*',
   defining: true,
-
+  // selectable: true,
+  // draggable: true,
   // atom: true,
   parseDOM: [
     {