diff --git a/.smalltalk-legacy.ston b/.smalltalk-legacy.ston
new file mode 100644
index 00000000..16e8a06c
--- /dev/null
+++ b/.smalltalk-legacy.ston
@@ -0,0 +1,12 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'Voyage',
+      #directory : 'mc',
+      #load : [ 'mongo tests' ],	  
+      #platforms : [ #pharo ],
+      #useLatestMetacello : true
+    }
+  ]
+}
+
diff --git a/.smalltalk.ston b/.smalltalk.ston
index 16e8a06c..b4e5fc13 100644
--- a/.smalltalk.ston
+++ b/.smalltalk.ston
@@ -4,8 +4,7 @@ SmalltalkCISpec {
       #baseline : 'Voyage',
       #directory : 'mc',
       #load : [ 'mongo tests' ],	  
-      #platforms : [ #pharo ],
-      #useLatestMetacello : true
+      #platforms : [ #pharo ]
     }
   ]
 }
diff --git a/.travis.yml b/.travis.yml
index 620c92a1..ded809dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,20 +5,29 @@ os:
 #  - osx
 install:
   - pip install --user benchupload
+
 services: 
   - mongodb
-smalltalk:
-  - Pharo-6.0
-  - Pharo-5.0
-smalltalk_config: .smalltalk.ston
+
 matrix:
   include:
+    - smalltalk: Pharo-7.0
+      smalltalk_config: .smalltalk.ston
+    - smalltalk: Pharo-6.0
+      smalltalk_config: .smalltalk-legacy.ston
+    - smalltalk: Pharo-5.0
+      smalltalk_config: .smalltalk-legacy.ston
+    - smalltalk: Pharo-7.0
+      before_script: wget https://github.com/pharo-nosql/PunQLite/releases/download/stable/unqlite.so
+      smalltalk_config: .smalltalk-unqlite.ston
     - smalltalk: Pharo-6.0
       before_script: wget https://github.com/pharo-nosql/PunQLite/releases/download/stable/unqlite.so
       smalltalk_config: .smalltalk-unqlite.ston
     - smalltalk: Pharo-5.0
       before_script: wget https://github.com/pharo-nosql/PunQLite/releases/download/stable/unqlite.so
       smalltalk_config: .smalltalk-unqlite.ston
+    - smalltalk: Pharo-7.0
+      smalltalk_config: .smalltalk-multiple.ston
     - smalltalk: Pharo-6.0
       smalltalk_config: .smalltalk-multiple.ston
     - smalltalk: Pharo-5.0
diff --git a/mc/BaselineOfVoyage.package/BaselineOfVoyage.class/instance/magritte..st b/mc/BaselineOfVoyage.package/BaselineOfVoyage.class/instance/magritte..st
index fba70933..b57342b9 100644
--- a/mc/BaselineOfVoyage.package/BaselineOfVoyage.class/instance/magritte..st
+++ b/mc/BaselineOfVoyage.package/BaselineOfVoyage.class/instance/magritte..st
@@ -2,5 +2,5 @@ external projects
 magritte: spec
 	spec 
 		baseline: 'Magritte' 
-			with: [ spec repository: 'github://magritte-metamodel/magritte:v3.5.2/source';
+			with: [ spec repository: 'github://magritte-metamodel/magritte:v3.5.3/source';
 			loads: #( 'Core' ) ]
\ No newline at end of file
diff --git a/mc/BaselineOfVoyage.package/BaselineOfVoyage.class/instance/mongoTalk..st b/mc/BaselineOfVoyage.package/BaselineOfVoyage.class/instance/mongoTalk..st
index ef506bd3..174dfdf9 100644
--- a/mc/BaselineOfVoyage.package/BaselineOfVoyage.class/instance/mongoTalk..st
+++ b/mc/BaselineOfVoyage.package/BaselineOfVoyage.class/instance/mongoTalk..st
@@ -2,5 +2,5 @@ external projects
 mongoTalk: spec
 	spec 
 		baseline: 'MongoTalk' 
-			with: [ spec repository: 'github://pharo-nosql/mongotalk:1.14/mc' ];
+			with: [ spec repository: 'github://pharo-nosql/mongotalk:1.15/mc' ];
 		import: 'MongoTalk'
diff --git a/mc/Voyage-JSON.package/TVOManyRelation.trait/properties.json b/mc/Voyage-JSON.package/TVOManyRelation.trait/properties.json
index cb986835..7a685a48 100644
--- a/mc/Voyage-JSON.package/TVOManyRelation.trait/properties.json
+++ b/mc/Voyage-JSON.package/TVOManyRelation.trait/properties.json
@@ -1,5 +1,7 @@
 {
-	"name" : "TVOManyRelation",
 	"commentStamp" : "TorstenBergmann 3/4/2015 20:39",
-	"category" : "Voyage-JSON-Magritte"
+	"classinstvars" : [ ],
+	"category" : "Voyage-JSON-Magritte",
+	"instvars" : [ ],
+	"name" : "TVOManyRelation"
 }
\ No newline at end of file
diff --git a/mc/Voyage-JSON.package/TVOPostLoad.trait/properties.json b/mc/Voyage-JSON.package/TVOPostLoad.trait/properties.json
index b6ea2234..d36a1216 100644
--- a/mc/Voyage-JSON.package/TVOPostLoad.trait/properties.json
+++ b/mc/Voyage-JSON.package/TVOPostLoad.trait/properties.json
@@ -1,5 +1,7 @@
 {
-	"name" : "TVOPostLoad",
 	"commentStamp" : "TorstenBergmann 3/4/2015 20:39",
-	"category" : "Voyage-JSON-Magritte"
+	"classinstvars" : [ ],
+	"category" : "Voyage-JSON-Magritte",
+	"instvars" : [ ],
+	"name" : "TVOPostLoad"
 }
\ No newline at end of file
diff --git a/mc/Voyage-JSON.package/VODescriptionBuilder.class/instance/removeDuplicated..st b/mc/Voyage-JSON.package/VODescriptionBuilder.class/instance/removeDuplicated..st
index 6a0759e5..3c31edf4 100644
--- a/mc/Voyage-JSON.package/VODescriptionBuilder.class/instance/removeDuplicated..st
+++ b/mc/Voyage-JSON.package/VODescriptionBuilder.class/instance/removeDuplicated..st
@@ -7,7 +7,7 @@ removeDuplicated: aCollection
 		inject: Dictionary new
 		into: [ :all :each | 
 			all
-				at: each selector put: each;
+				at: each method selector put: each;
 				yourself ]) 
 			values 
 			asSet