diff --git a/models/Memento.Json b/models/Memento.Json
deleted file mode 100644
index ce8bc73..0000000
--- a/models/Memento.Json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "Memento",
-  "contexts" : [
-    {
-      "relations": [],
-      "transfer": {
-        "src": "Star.StarMementoInternal",
-        "dst": "States.StarMementoInternal",
-        "data": {"name": "memento"},
-        "style": "PUSH",
-        "multiplicity": "1:1"
-      }
-    },
-    {
-      "relations": [],
-      "transfer": {
-        "src": "States.StarMementoInternal",
-        "dst": "Star.StarMementoInternal",
-        "data": {"name": "memento"},
-        "style": "PUSH",
-        "multiplicity": "1:1"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/models/designPattern/Composite.Json b/models/designPattern/Composite.Json
index bd4ba93..5ae8210 100644
--- a/models/designPattern/Composite.Json
+++ b/models/designPattern/Composite.Json
@@ -4,10 +4,9 @@
     {
       "relations": [],
       "transfer": {
-        "src": "Messenger.Sentence",
-        "dst": "Main",
+        "src": "Messenger.Sentence.Data",
+        "dst": "Main.Data",
         "data": {
-          "type": "Data",
           "name": "data"
         },
         "style": "PULL",
@@ -17,10 +16,9 @@
     {
       "relations": [],
       "transfer": {
-        "src": "Sentence.{Word}",
-        "dst": "Messenger",
+        "src": "Sentence.{Word}.Data",
+        "dst": "Messenger.Data",
         "data": {
-          "type": "Data",
           "name": "data"
         },
         "style": "PULL",
@@ -30,10 +28,9 @@
     {
       "relations": [],
       "transfer": {
-        "src": "Word",
-        "dst": "Sentence",
+        "src": "Word.Data",
+        "dst": "Sentence.Data",
         "data": {
-          "type": "Data",
           "name": "data"
         },
         "style": "PULL",
@@ -43,10 +40,9 @@
     {
       "relations": [],
       "transfer": {
-        "src": "Letter",
-        "dst": "Word",
+        "src": "Letter.char",
+        "dst": "Word.char",
         "data": {
-          "type": "char",
           "name": "char"
         },
         "style": "PULL",
@@ -56,10 +52,9 @@
     {
       "relations": [],
       "transfer": {
-        "src": "Letter",
-        "dst": "LetterComposite.{LetterComposite}",
+        "src": "Letter.Data",
+        "dst": "LetterComposite.{LetterComposite}.Data",
         "data": {
-          "type": "Data",
           "name": "data"
         },
         "style": "PULL",
diff --git a/models/designPattern/Memento.Json b/models/designPattern/Memento.Json
new file mode 100644
index 0000000..2aa7b91
--- /dev/null
+++ b/models/designPattern/Memento.Json
@@ -0,0 +1,25 @@
+{
+  "name" : "Memento",
+  "contexts" : [
+    {
+      "relations": [],
+      "transfer": {
+        "src": "Main.Star.StarMementoInternal",
+        "dst": "Main.States.StarMementoInternal",
+        "data": {"name": "memento"},
+        "style": "PLAIN",
+        "multiplicity": "1:1"
+      }
+    },
+    {
+      "relations": [],
+      "transfer": {
+        "src": "Main.States.StarMementoInternal",
+        "dst": "Main.Star.StarMementoInternal",
+        "data": {"name": "memento"},
+        "style": "PLAIN",
+        "multiplicity": "1:1"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/models/designPattern/Visitor.Json b/models/designPattern/Visitor.Json
index 9c89347..acff773 100644
--- a/models/designPattern/Visitor.Json
+++ b/models/designPattern/Visitor.Json
@@ -5,11 +5,11 @@
       "relations": [],
       "transfer": {
         "src": "Main.SoldierVisitor",
-        "dst": "Commander.{Sergent}.{Soldier}.SoldierVisitor",
+        "dst": "Main.Commander.{Sergent}.{Soldier}.SoldierVisitor",
         "data": {
           "name": "visitor"
         },
-        "style": "PUSH",
+        "style": "PLAIN",
         "multiplicity": "1:*"
       }
     }
diff --git a/src/main/java/designPatternExtensions/designPattern/Memento.java b/src/main/java/designPatternExtensions/designPattern/Memento.java
index 48ba242..7be572c 100644
--- a/src/main/java/designPatternExtensions/designPattern/Memento.java
+++ b/src/main/java/designPatternExtensions/designPattern/Memento.java
@@ -8,23 +8,23 @@
 
 public class Memento implements DesignPattern{
     public DataSynchronizationDesign create() throws IllegalRelationException {
-        DataSynchronizationDesign design = ModelLoader.load("models/Memento.Json");
+        DataSynchronizationDesign design = ModelLoader.load("models/designPattern/Memento.Json");
         DataSynchronizationContext dtc = design.getSynchronizationContexts().getFirst();
         ObjectNode star = dtc.getSrcTopObject();
         ObjectNode states = dtc.getDstTopObject();
 
-        ObjectNode presenter = new ObjectNode("Main");
-        PresenterInsertion main = new PresenterInsertion(star, states,
-                presenter, dtc.getTransferStyle(), true);
-        design.addPresenterInsertion(main);
+//        ObjectNode presenter = new ObjectNode("Main");
+//        PresenterInsertion main = new PresenterInsertion(star, states,
+//                presenter, dtc.getTransferStyle(), true);
+//        design.addPresenterInsertion(main);
 
         DataSynchronizationContext dtc2 = design.getSynchronizationContexts().getLast();
         ObjectNode states2 = dtc2.getSrcTopObject();
         ObjectNode star2 = dtc2.getDstTopObject();
 
-        PresenterInsertion main2 = new PresenterInsertion(states2, star2,
-                presenter, dtc2.getTransferStyle(), true);
-        design.addPresenterInsertion(main2);
+//        PresenterInsertion main2 = new PresenterInsertion(states2, star2,
+//                presenter, dtc2.getTransferStyle(), true);
+//        design.addPresenterInsertion(main2);
 
         ObjectNode starMementoInternal = new ObjectNode("StarMementoInternal");
         DependencyInversion di = new DependencyInversion(