diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 7e8606366978019dcdd6d1dcd4ee2350864cd8f8..09c338aa8b24e039827db5350327ba3330ae5cec 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -68,7 +68,7 @@ const Hhmi = () => {
         value={t}
         readonly={readOnly}
         layout={HhmiLayout}
-        // onChange={source => console.log(source)}
+        onChange={source => console.log(source)}
       />
     </>
   );
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/ContainerEditor.js b/wax-prosemirror-services/src/FillTheGapQuestionService/components/ContainerEditor.js
index 57a1a5b93a1f6e1d243f03b1bd49e57c306ed0b5..b25b24aa21fbbacb32121e9cee12fe2bdae3ce6a 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/components/ContainerEditor.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/components/ContainerEditor.js
@@ -32,7 +32,6 @@ const EditorWrapper = styled.span`
 `;
 
 const EditorComponent = ({ node, view, getPos }) => {
-  console.log(node);
   const editorRef = useRef();
 
   const context = useContext(WaxContext);
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
index 7175d31eacb1a97088140d5c5bf76cda0f5cfd84..11b09b05f4f111763fdf5dc3da2d6a1b2612281a 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
@@ -2,6 +2,8 @@ const fillTheGapContainerNode = {
   attrs: {
     id: { default: '' },
     class: { default: 'fill-the-gap' },
+    answer: { default: false },
+    feedback: { default: '' },
   },
   group: 'block questions',
   atom: true,
@@ -16,6 +18,8 @@ const fillTheGapContainerNode = {
         return {
           id: dom.dataset.id,
           class: dom.getAttribute('class'),
+          answer: JSON.parse(dom.getAttribute('answer').toLowerCase()),
+          feedback: dom.getAttribute('feedback'),
         };
       },
     },
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
index 7afdcfe46c586c87ed81a78fe90761db056d1c34..d8b64096ce1f976ce46918ee953e6673c735a757 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
@@ -1,13 +1,13 @@
 const fillTheGapNode = {
+  attrs: {
+    id: { default: '' },
+    class: { default: 'fill-the-gap' },
+  },
   group: 'inline',
   content: 'text*',
   inline: true,
   atom: true,
   excludes: 'fill_the_gap',
-  attrs: {
-    id: { default: '' },
-    class: { default: 'fill-the-gap' },
-  },
   parseDOM: [
     {
       tag: 'span.fill-the-gap',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
index a1a4ba8a0ffe14b5e377ce84d4540729b3c38fd8..e599b8c6d0594b00247291e2f2544713269e4e7a 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
@@ -1,8 +1,6 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const multipleChoiceSingleCorrectContainerNode = {
   attrs: {
-    id: { default: uuidv4() },
+    id: { default: '' },
     class: { default: 'multiple-choice-single-correct' },
     correctId: { default: '' },
   },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
index 3abffaeffa1b7c422f5c097520bd71606ca13a79..5b3dc591c0db0b9f44012f81678d2a8df0679611 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js
@@ -1,9 +1,7 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const multipleChoiceSingleCorrectNode = {
   attrs: {
     class: { default: 'multiple-choice-option-single-correct' },
-    id: { default: uuidv4() },
+    id: { default: '' },
     correct: { default: false },
     answer: { default: false },
     feedback: { default: '' },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
index 7ffbd3a301dc3864604297f9b8172922e8655433..dc9dc917d3e9ef9600e66de4a6dd98484b6211c2 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
@@ -1,9 +1,7 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const questionSingleNode = {
   attrs: {
+    id: { default: '' },
     class: { default: 'multiple-choice-question-single' },
-    id: { default: uuidv4() },
   },
   group: 'block questions',
   content: 'block*',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
index 7dc512466e49439310472866c8061faae069ed71..46a41394a6ebe3c4aad18f167caf57c58068faa6 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
@@ -1,9 +1,7 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const questionTrueFalseNode = {
   attrs: {
+    id: { default: '' },
     class: { default: 'true-false-question' },
-    id: { default: uuidv4() },
   },
   group: 'block questions',
   content: 'block*',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js
index d7f82a8e53c47fef6fb9d8883905edbf0d3c308f..8150946dd1c0dc3e7932157fad4ca68bf96eedc1 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js
@@ -1,9 +1,7 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const trueFalseNode = {
   attrs: {
     class: { default: 'true-false-option' },
-    id: { default: uuidv4() },
+    id: { default: '' },
     correct: { default: false },
     answer: { default: false },
     feedback: { default: '' },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
index a75a918c7aa385406a6d566f41e9202e0d5b4d84..f3385105c3cdc38c72cec984e973065f1e9799a1 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
@@ -1,9 +1,7 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const questionTrueFalseNode = {
   attrs: {
+    id: { default: '' },
     class: { default: 'true-false-question-single' },
-    id: { default: uuidv4() },
   },
   group: 'block questions',
   content: 'block*',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js
index f5f90c4c0a0fc733a499efe99f3140ceeb8f8df4..e56c8c88a94e9ca6d7c420ea12fd08ad8c186270 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js
@@ -1,9 +1,7 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const trueFalseSingleCorrectNode = {
   attrs: {
+    id: { default: '' },
     class: { default: 'true-false-single-correct-option' },
-    id: { default: uuidv4() },
     correct: { default: false },
     answer: { default: false },
     feedback: { default: '' },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
index c8e0d10bd155cfdd3ac18095694551ee5af37fcf..ffe3c980123a5237b68f0e8a1ecd5ef0df5ca563 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
@@ -1,8 +1,6 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const multipleChoiceContainerNode = {
   attrs: {
-    id: { default: uuidv4() },
+    id: { default: '' },
     class: { default: 'multiple-choice' },
   },
   group: 'block questions',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index b3b15511d2588afbe79dd43974c8e9ccd46f810e..daf0168fab9ba5dfdcb57788072292fa1f4c7ec3 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -1,9 +1,7 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const multipleChoiceNode = {
   attrs: {
     class: { default: 'multiple-choice-option' },
-    id: { default: uuidv4() },
+    id: { default: '' },
     correct: { default: false },
     answer: { default: false },
     feedback: { default: '' },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
index efa190215d10c3f2bb8c907603e53c77d432a62e..fa591559f05643a0913749dc6865df6effc6313c 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
@@ -1,9 +1,7 @@
-import { v4 as uuidv4 } from 'uuid';
-
 const questionNode = {
   attrs: {
     class: { default: 'multiple-choice-question' },
-    id: { default: uuidv4() },
+    id: { default: '' },
   },
   group: 'block questions',
   content: 'block*',