diff --git a/CHANGELOG b/CHANGELOG
index f37303df1d..a2674d02c8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-v2.5.0-alpha5 (2015-02-18)
+v2.5.0-alpha6 (2015-02-18)
 -------------------
 
 * front-end: dashboard tries not to (re)load statistics if user has no access
diff --git a/Documentation/Examples/CollectionUnload.generated b/Documentation/Examples/CollectionUnload.generated
index f4cf46a3d8..b32581db92 100644
--- a/Documentation/Examples/CollectionUnload.generated
+++ b/Documentation/Examples/CollectionUnload.generated
@@ -1,5 +1,5 @@
 arangosh> col = db.example;
-[ArangoCollection 951707995, "example" (type document, status loaded)]
+[ArangoCollection 949133613, "example" (type document, status loaded)]
 arangosh> col.unload();
 arangosh> col;
-[ArangoCollection 951707995, "example" (type document, status unloaded)]
+[ArangoCollection 949133613, "example" (type document, status unloaded)]
diff --git a/Documentation/Examples/HttpGharialAddEdge.generated b/Documentation/Examples/HttpGharialAddEdge.generated
index 9829adc0cc..bda0b3f62e 100644
--- a/Documentation/Examples/HttpGharialAddEdge.generated
+++ b/Documentation/Examples/HttpGharialAddEdge.generated
@@ -7,14 +7,14 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/gharial
 
 HTTP/1.1 202 Accepted
 content-type: application/json
-etag: 1489103195
+etag: 1488429357
 
 { 
   "error" : false, 
   "code" : 202, 
   "edge" : { 
-    "_id" : "relation/1489103195", 
-    "_rev" : "1489103195", 
-    "_key" : "1489103195" 
+    "_id" : "relation/1488429357", 
+    "_rev" : "1488429357", 
+    "_key" : "1488429357" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialAddEdgeCol.generated b/Documentation/Examples/HttpGharialAddEdgeCol.generated
index 62d1c2ef5a..95c5514951 100644
--- a/Documentation/Examples/HttpGharialAddEdgeCol.generated
+++ b/Documentation/Examples/HttpGharialAddEdgeCol.generated
@@ -12,7 +12,7 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/gharial
 
 HTTP/1.1 201 Created
 content-type: application/json
-etag: 1449716059
+etag: 1449107757
 
 { 
   "error" : false, 
@@ -44,6 +44,6 @@ etag: 1449716059
     ], 
     "orphanCollections" : [ ], 
     "_id" : "_graphs/social", 
-    "_rev" : "1449716059" 
+    "_rev" : "1449107757" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialAddVertex.generated b/Documentation/Examples/HttpGharialAddVertex.generated
index 284719da4c..7a7acf1c9d 100644
--- a/Documentation/Examples/HttpGharialAddVertex.generated
+++ b/Documentation/Examples/HttpGharialAddVertex.generated
@@ -5,14 +5,14 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/gharial
 
 HTTP/1.1 202 Accepted
 content-type: application/json
-etag: 1466493275
+etag: 1465819437
 
 { 
   "error" : false, 
   "code" : 202, 
   "vertex" : { 
-    "_id" : "male/1466493275", 
-    "_rev" : "1466493275", 
-    "_key" : "1466493275" 
+    "_id" : "male/1465819437", 
+    "_rev" : "1465819437", 
+    "_key" : "1465819437" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialAddVertexCol.generated b/Documentation/Examples/HttpGharialAddVertexCol.generated
index b486784b2d..aa3a7b1812 100644
--- a/Documentation/Examples/HttpGharialAddVertexCol.generated
+++ b/Documentation/Examples/HttpGharialAddVertexCol.generated
@@ -5,7 +5,7 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/gharial
 
 HTTP/1.1 201 Created
 content-type: application/json
-etag: 1432349019
+etag: 1431740717
 
 { 
   "error" : false, 
@@ -29,6 +29,6 @@ etag: 1432349019
       "otherVertices" 
     ], 
     "_id" : "_graphs/social", 
-    "_rev" : "1432349019" 
+    "_rev" : "1431740717" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialCreate.generated b/Documentation/Examples/HttpGharialCreate.generated
index 9fe8066274..15bb226800 100644
--- a/Documentation/Examples/HttpGharialCreate.generated
+++ b/Documentation/Examples/HttpGharialCreate.generated
@@ -16,7 +16,7 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/gharial
 
 HTTP/1.1 201 Created
 content-type: application/json
-etag: 1420093787
+etag: 1419485485
 
 { 
   "error" : false, 
@@ -36,6 +36,6 @@ etag: 1420093787
     ], 
     "orphanCollections" : [ ], 
     "_id" : "_graphs/myGraph", 
-    "_rev" : "1420093787" 
+    "_rev" : "1419485485" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialEdgeDefinitionRemove.generated b/Documentation/Examples/HttpGharialEdgeDefinitionRemove.generated
index d39337ef55..a24dbb80af 100644
--- a/Documentation/Examples/HttpGharialEdgeDefinitionRemove.generated
+++ b/Documentation/Examples/HttpGharialEdgeDefinitionRemove.generated
@@ -2,7 +2,7 @@ shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/ghari
 
 HTTP/1.1 200 OK
 content-type: application/json
-etag: 1459677531
+etag: 1459003693
 
 { 
   "error" : false, 
@@ -15,6 +15,6 @@ etag: 1459677531
       "male" 
     ], 
     "_id" : "_graphs/social", 
-    "_rev" : "1459677531" 
+    "_rev" : "1459003693" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialGetEdge.generated b/Documentation/Examples/HttpGharialGetEdge.generated
index 13a87b27bc..67df4c51c8 100644
--- a/Documentation/Examples/HttpGharialGetEdge.generated
+++ b/Documentation/Examples/HttpGharialGetEdge.generated
@@ -2,7 +2,7 @@ shell> curl --data-binary @- --dump - http://localhost:8529/_api/gharial/social/
 
 HTTP/1.1 200 OK
 content-type: application/json
-etag: 1492117851
+etag: 1491444013
 
 { 
   "error" : false, 
@@ -10,7 +10,7 @@ etag: 1492117851
   "edge" : { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "1492117851", 
+    "_rev" : "1491444013", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
diff --git a/Documentation/Examples/HttpGharialGetGraph.generated b/Documentation/Examples/HttpGharialGetGraph.generated
index 4cffa5ed86..355c38f0ca 100644
--- a/Documentation/Examples/HttpGharialGetGraph.generated
+++ b/Documentation/Examples/HttpGharialGetGraph.generated
@@ -2,7 +2,7 @@ shell> curl --data-binary @- --dump - http://localhost:8529/_api/gharial/myGraph
 
 HTTP/1.1 200 OK
 content-type: application/json
-etag: 1421732187
+etag: 1421189421
 
 { 
   "error" : false, 
@@ -22,6 +22,6 @@ etag: 1421732187
     ], 
     "orphanCollections" : [ ], 
     "_id" : "_graphs/myGraph", 
-    "_rev" : "1421732187" 
+    "_rev" : "1421189421" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialGetVertex.generated b/Documentation/Examples/HttpGharialGetVertex.generated
index 492bc2a400..f8694431df 100644
--- a/Documentation/Examples/HttpGharialGetVertex.generated
+++ b/Documentation/Examples/HttpGharialGetVertex.generated
@@ -2,7 +2,7 @@ shell> curl --data-binary @- --dump - http://localhost:8529/_api/gharial/social/
 
 HTTP/1.1 200 OK
 content-type: application/json
-etag: 1468459355
+etag: 1467785517
 
 { 
   "error" : false, 
@@ -10,7 +10,7 @@ etag: 1468459355
   "vertex" : { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "1468459355", 
+    "_rev" : "1467785517", 
     "name" : "Alice" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialList.generated b/Documentation/Examples/HttpGharialList.generated
index eccc4a13fa..fb051fb8a9 100644
--- a/Documentation/Examples/HttpGharialList.generated
+++ b/Documentation/Examples/HttpGharialList.generated
@@ -10,7 +10,7 @@ content-type: application/json
     { 
       "_id" : "_graphs/social", 
       "_key" : "social", 
-      "_rev" : "1399253339", 
+      "_rev" : "1397334317", 
       "edgeDefinitions" : [ 
         { 
           "collection" : "relation", 
@@ -29,7 +29,7 @@ content-type: application/json
     { 
       "_id" : "_graphs/routeplanner", 
       "_key" : "routeplanner", 
-      "_rev" : "1403578715", 
+      "_rev" : "1401659693", 
       "orphanCollections" : [ ], 
       "edgeDefinitions" : [ 
         { 
diff --git a/Documentation/Examples/HttpGharialModifyVertex.generated b/Documentation/Examples/HttpGharialModifyVertex.generated
index 747a2f8372..c0cf9cc53f 100644
--- a/Documentation/Examples/HttpGharialModifyVertex.generated
+++ b/Documentation/Examples/HttpGharialModifyVertex.generated
@@ -5,15 +5,15 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/gharia
 
 HTTP/1.1 202 Accepted
 content-type: application/json
-etag: 1479666011
+etag: 1478992173
 
 { 
   "error" : false, 
   "code" : 202, 
   "vertex" : { 
     "_id" : "female/alice", 
-    "_rev" : "1479666011", 
-    "_oldRev" : "1477175643", 
+    "_rev" : "1478992173", 
+    "_oldRev" : "1476501805", 
     "_key" : "alice" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialPatchEdge.generated b/Documentation/Examples/HttpGharialPatchEdge.generated
index 7a96f3bd1c..e1804f3267 100644
--- a/Documentation/Examples/HttpGharialPatchEdge.generated
+++ b/Documentation/Examples/HttpGharialPatchEdge.generated
@@ -5,15 +5,15 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/gharia
 
 HTTP/1.1 202 Accepted
 content-type: application/json
-etag: 1502013787
+etag: 1501339949
 
 { 
   "error" : false, 
   "code" : 202, 
   "edge" : { 
     "_id" : "relation/aliceAndBob", 
-    "_rev" : "1502013787", 
-    "_oldRev" : "1500571995", 
+    "_rev" : "1501339949", 
+    "_oldRev" : "1499898157", 
     "_key" : "aliceAndBob" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialPutEdge.generated b/Documentation/Examples/HttpGharialPutEdge.generated
index 8b18d67a6b..b4ffa7f066 100644
--- a/Documentation/Examples/HttpGharialPutEdge.generated
+++ b/Documentation/Examples/HttpGharialPutEdge.generated
@@ -5,15 +5,15 @@ shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/gharial/
 
 HTTP/1.1 202 Accepted
 content-type: application/json
-etag: 1497557339
+etag: 1496883501
 
 { 
   "error" : false, 
   "code" : 202, 
   "edge" : { 
     "_id" : "relation/aliceAndBob", 
-    "_rev" : "1497557339", 
-    "_oldRev" : "1496246619", 
+    "_rev" : "1496883501", 
+    "_oldRev" : "1495572781", 
     "_key" : "aliceAndBob" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialRemoveVertexCollection.generated b/Documentation/Examples/HttpGharialRemoveVertexCollection.generated
index 287188dcd4..dbfe13a509 100644
--- a/Documentation/Examples/HttpGharialRemoveVertexCollection.generated
+++ b/Documentation/Examples/HttpGharialRemoveVertexCollection.generated
@@ -2,7 +2,7 @@ shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/ghari
 
 HTTP/1.1 200 OK
 content-type: application/json
-etag: 1439361371
+etag: 1438687533
 
 { 
   "error" : false, 
@@ -24,6 +24,6 @@ etag: 1439361371
     ], 
     "orphanCollections" : [ ], 
     "_id" : "_graphs/social", 
-    "_rev" : "1439361371" 
+    "_rev" : "1438687533" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialReplaceEdgeCol.generated b/Documentation/Examples/HttpGharialReplaceEdgeCol.generated
index 93163f32e8..0d9db07a09 100644
--- a/Documentation/Examples/HttpGharialReplaceEdgeCol.generated
+++ b/Documentation/Examples/HttpGharialReplaceEdgeCol.generated
@@ -15,7 +15,7 @@ shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/gharial/
 
 HTTP/1.1 200 OK
 content-type: application/json
-etag: 1454762331
+etag: 1454154029
 
 { 
   "error" : false, 
@@ -39,6 +39,6 @@ etag: 1454762331
     ], 
     "orphanCollections" : [ ], 
     "_id" : "_graphs/social", 
-    "_rev" : "1454762331" 
+    "_rev" : "1454154029" 
   } 
 }
diff --git a/Documentation/Examples/HttpGharialReplaceVertex.generated b/Documentation/Examples/HttpGharialReplaceVertex.generated
index fbd4b79973..0ad02b5e3d 100644
--- a/Documentation/Examples/HttpGharialReplaceVertex.generated
+++ b/Documentation/Examples/HttpGharialReplaceVertex.generated
@@ -6,15 +6,15 @@ shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/gharial/
 
 HTTP/1.1 202 Accepted
 content-type: application/json
-etag: 1475144027
+etag: 1474470189
 
 { 
   "error" : false, 
   "code" : 202, 
   "vertex" : { 
     "_id" : "female/alice", 
-    "_rev" : "1475144027", 
-    "_oldRev" : "1472653659", 
+    "_rev" : "1474470189", 
+    "_oldRev" : "1471979821", 
     "_key" : "alice" 
   } 
 }
diff --git a/Documentation/Examples/RestAdminStatistics1.generated b/Documentation/Examples/RestAdminStatistics1.generated
index bb541a547c..6526829ce0 100644
--- a/Documentation/Examples/RestAdminStatistics1.generated
+++ b/Documentation/Examples/RestAdminStatistics1.generated
@@ -4,21 +4,21 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "time" : 1424297626.031688, 
+  "time" : 1424344359.581138, 
   "system" : { 
-    "minorPageFaults" : 63313, 
-    "majorPageFaults" : 2907, 
-    "userTime" : 7.661292, 
-    "systemTime" : 4.342269, 
+    "minorPageFaults" : 58700, 
+    "majorPageFaults" : 2916, 
+    "userTime" : 7.460499, 
+    "systemTime" : 4.528952, 
     "numberOfThreads" : 26, 
-    "residentSize" : 136458240, 
-    "residentSizePercent" : 0.03177165985107422, 
-    "virtualSize" : 5119266816 
+    "residentSize" : 142340096, 
+    "residentSizePercent" : 0.033141136169433594, 
+    "virtualSize" : 5107728384 
   }, 
   "client" : { 
     "httpConnections" : 1, 
     "connectionTime" : { 
-      "sum" : 0.002577066421508789, 
+      "sum" : 0.0015480518341064453, 
       "count" : 1, 
       "counts" : [ 
         1, 
@@ -28,33 +28,33 @@ content-type: application/json; charset=utf-8
       ] 
     }, 
     "totalTime" : { 
-      "sum" : 41.27445030212402, 
+      "sum" : 23.22349739074707, 
       "count" : 10674, 
       "counts" : [ 
-        10179, 
-        360, 
-        78, 
-        42, 
-        13, 
-        0, 
-        2 
+        10217, 
+        399, 
+        33, 
+        21, 
+        2, 
+        1, 
+        1 
       ] 
     }, 
     "requestTime" : { 
-      "sum" : 39.629737854003906, 
+      "sum" : 21.56511664390564, 
       "count" : 10674, 
       "counts" : [ 
-        10182, 
-        358, 
-        78, 
-        42, 
-        12, 
-        0, 
-        2 
+        10221, 
+        396, 
+        33, 
+        20, 
+        2, 
+        1, 
+        1 
       ] 
     }, 
     "queueTime" : { 
-      "sum" : 0.2529916763305664, 
+      "sum" : 0.26316285133361816, 
       "count" : 10674, 
       "counts" : [ 
         10674, 
@@ -67,24 +67,24 @@ content-type: application/json; charset=utf-8
       ] 
     }, 
     "ioTime" : { 
-      "sum" : 1.3917207717895508, 
+      "sum" : 1.3952178955078125, 
       "count" : 10674, 
       "counts" : [ 
         10673, 
         0, 
         0, 
-        0, 
         1, 
         0, 
+        0, 
         0 
       ] 
     }, 
     "bytesSent" : { 
-      "sum" : 3939778, 
+      "sum" : 3939521, 
       "count" : 10674, 
       "counts" : [ 
-        2797, 
-        7712, 
+        2796, 
+        7713, 
         21, 
         12, 
         132, 
@@ -117,7 +117,7 @@ content-type: application/json; charset=utf-8
     "requestsOther" : 0 
   }, 
   "server" : { 
-    "uptime" : 51.222331047058105, 
+    "uptime" : 32.97909498214722, 
     "physicalMemory" : 4294967296 
   }, 
   "error" : false, 
diff --git a/Documentation/Examples/RestBatchMultipartHeader.generated b/Documentation/Examples/RestBatchMultipartHeader.generated
index 221b1abf0b..96e98a4f65 100644
--- a/Documentation/Examples/RestBatchMultipartHeader.generated
+++ b/Documentation/Examples/RestBatchMultipartHeader.generated
@@ -37,4 +37,4 @@ HTTP/1.1 200 OK
 content-type: multipart/form-data; boundary=SomeBoundaryValue
 x-arango-errors: 1
 
-"--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: myId1\r\n\r\nHTTP/1.1 200 OK\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 44\r\n\r\n{\"server\":\"arango\",\"version\":\"2.5.0-alpha5\"}\r\n--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: myId2\r\n\r\nHTTP/1.1 404 Not Found\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 88\r\n\r\n{\"error\":true,\"code\":404,\"errorNum\":1203,\"errorMessage\":\"unknown collection 'products'\"}\r\n--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: someId\r\n\r\nHTTP/1.1 200 OK\r\nLocation: /_db/_system/_api/collection/products\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 138\r\n\r\n{\"id\":\"1506666843\",\"name\":\"products\",\"waitForSync\":false,\"isVolatile\":false,\"isSystem\":false,\"status\":3,\"type\":2,\"error\":false,\"code\":200}\r\n--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: nextId\r\n\r\nHTTP/1.1 200 OK\r\nLocation: /_db/_system/_api/collection/products/figures\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 618\r\n\r\n{\"id\":\"1506666843\",\"name\":\"products\",\"isSystem\":false,\"doCompact\":true,\"isVolatile\":false,\"journalSize\":1048576,\"keyOptions\":{\"type\":\"traditional\",\"allowUserKeys\":true},\"waitForSync\":false,\"count\":0,\"figures\":{\"alive\":{\"count\":0,\"size\":0},\"dead\":{\"count\":0,\"size\":0,\"deletion\":0},\"datafiles\":{\"count\":0,\"fileSize\":0},\"journals\":{\"count\":0,\"fileSize\":0},\"compactors\":{\"count\":0,\"fileSize\":0},\"shapefiles\":{\"count\":0,\"fileSize\":0},\"shapes\":{\"count\":0,\"size\":0},\"attributes\":{\"count\":0,\"size\":0},\"indexes\":{\"count\":1,\"size\":2008},\"lastTick\":\"0\",\"uncollectedLogfileEntries\":0},\"status\":3,\"type\":2,\"error\":false,\"code\":200}\r\n--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: otherId\r\n\r\nHTTP/1.1 200 OK\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 44\r\n\r\n{\"id\":\"1506666843\",\"error\":false,\"code\":200}\r\n--SomeBoundaryValue--"
+"--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: myId1\r\n\r\nHTTP/1.1 200 OK\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 44\r\n\r\n{\"server\":\"arango\",\"version\":\"2.5.0-alpha6\"}\r\n--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: myId2\r\n\r\nHTTP/1.1 404 Not Found\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 88\r\n\r\n{\"error\":true,\"code\":404,\"errorNum\":1203,\"errorMessage\":\"unknown collection 'products'\"}\r\n--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: someId\r\n\r\nHTTP/1.1 200 OK\r\nLocation: /_db/_system/_api/collection/products\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 138\r\n\r\n{\"id\":\"1505993005\",\"name\":\"products\",\"waitForSync\":false,\"isVolatile\":false,\"isSystem\":false,\"status\":3,\"type\":2,\"error\":false,\"code\":200}\r\n--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: nextId\r\n\r\nHTTP/1.1 200 OK\r\nLocation: /_db/_system/_api/collection/products/figures\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 618\r\n\r\n{\"id\":\"1505993005\",\"name\":\"products\",\"isSystem\":false,\"doCompact\":true,\"isVolatile\":false,\"journalSize\":1048576,\"keyOptions\":{\"type\":\"traditional\",\"allowUserKeys\":true},\"waitForSync\":false,\"count\":0,\"figures\":{\"alive\":{\"count\":0,\"size\":0},\"dead\":{\"count\":0,\"size\":0,\"deletion\":0},\"datafiles\":{\"count\":0,\"fileSize\":0},\"journals\":{\"count\":0,\"fileSize\":0},\"compactors\":{\"count\":0,\"fileSize\":0},\"shapefiles\":{\"count\":0,\"fileSize\":0},\"shapes\":{\"count\":0,\"size\":0},\"attributes\":{\"count\":0,\"size\":0},\"indexes\":{\"count\":1,\"size\":2008},\"lastTick\":\"0\",\"uncollectedLogfileEntries\":0},\"status\":3,\"type\":2,\"error\":false,\"code\":200}\r\n--SomeBoundaryValue\r\nContent-Type: application/x-arango-batchpart\r\nContent-Id: otherId\r\n\r\nHTTP/1.1 200 OK\r\nContent-Type: application/json; charset=utf-8\r\nContent-Length: 44\r\n\r\n{\"id\":\"1505993005\",\"error\":false,\"code\":200}\r\n--SomeBoundaryValue--"
diff --git a/Documentation/Examples/RestCollectionCreateCollection.generated b/Documentation/Examples/RestCollectionCreateCollection.generated
index c974f5d42f..ef32b5e3ea 100644
--- a/Documentation/Examples/RestCollectionCreateCollection.generated
+++ b/Documentation/Examples/RestCollectionCreateCollection.generated
@@ -6,7 +6,7 @@ content-type: application/json; charset=utf-8
 location: /_db/_system/_api/collection/testCollectionBasics
 
 { 
-  "id" : "1370876251", 
+  "id" : "1369153837", 
   "name" : "testCollectionBasics", 
   "waitForSync" : false, 
   "isVolatile" : false, 
@@ -24,7 +24,7 @@ content-type: application/json; charset=utf-8
 location: /_db/_system/_api/collection/testCollectionEdges
 
 { 
-  "id" : "1371007323", 
+  "id" : "1369284909", 
   "name" : "testCollectionEdges", 
   "waitForSync" : false, 
   "isVolatile" : false, 
diff --git a/Documentation/Examples/RestCollectionCreateKeyopt.generated b/Documentation/Examples/RestCollectionCreateKeyopt.generated
index 9266013657..78b73fb7fe 100644
--- a/Documentation/Examples/RestCollectionCreateKeyopt.generated
+++ b/Documentation/Examples/RestCollectionCreateKeyopt.generated
@@ -6,7 +6,7 @@ content-type: application/json; charset=utf-8
 location: /_db/_system/_api/collection/testCollectionUsers
 
 { 
-  "id" : "1371269467", 
+  "id" : "1369547053", 
   "name" : "testCollectionUsers", 
   "waitForSync" : false, 
   "isVolatile" : false, 
diff --git a/Documentation/Examples/RestCollectionDeleteCollectionIdentifier.generated b/Documentation/Examples/RestCollectionDeleteCollectionIdentifier.generated
index 08ff4b5165..e130f1acd8 100644
--- a/Documentation/Examples/RestCollectionDeleteCollectionIdentifier.generated
+++ b/Documentation/Examples/RestCollectionDeleteCollectionIdentifier.generated
@@ -1,10 +1,10 @@
-shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/collection/1397287259
+shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/collection/1395433773
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1397287259", 
+  "id" : "1395433773", 
   "error" : false, 
   "code" : 200 
 }
diff --git a/Documentation/Examples/RestCollectionDeleteCollectionName.generated b/Documentation/Examples/RestCollectionDeleteCollectionName.generated
index a47c67e6ae..dd15fec1ba 100644
--- a/Documentation/Examples/RestCollectionDeleteCollectionName.generated
+++ b/Documentation/Examples/RestCollectionDeleteCollectionName.generated
@@ -4,7 +4,7 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1397483867", 
+  "id" : "1395630381", 
   "error" : false, 
   "code" : 200 
 }
diff --git a/Documentation/Examples/RestCollectionGetAllCollections.generated b/Documentation/Examples/RestCollectionGetAllCollections.generated
index 6d9e7b8560..d2953d7a15 100644
--- a/Documentation/Examples/RestCollectionGetAllCollections.generated
+++ b/Documentation/Examples/RestCollectionGetAllCollections.generated
@@ -6,481 +6,481 @@ content-type: application/json; charset=utf-8
 { 
   "collections" : [ 
     { 
-      "id" : "1087301979", 
-      "name" : "germanHighway", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    { 
-      "id" : "1063709019", 
-      "name" : "male", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "2615643", 
-      "name" : "_cluster_kickstarter_plans", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "1002760539", 
-      "name" : "has_bought", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    { 
-      "id" : "1087695195", 
-      "name" : "internationalHighway", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    { 
-      "id" : "1002236251", 
-      "name" : "friend_of", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    { 
-      "id" : "1087170907", 
-      "name" : "germanCity", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "806545755", 
-      "name" : "geo", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "1063577947", 
-      "name" : "female", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "4712795", 
-      "name" : "_statisticsRaw", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "2484571", 
-      "name" : "_routing", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "1002629467", 
-      "name" : "Electronics", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "1087564123", 
-      "name" : "frenchHighway", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    { 
-      "id" : "1178265947", 
-      "name" : "edges2", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    { 
-      "id" : "1092872539", 
-      "name" : "animals", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "5106011", 
-      "name" : "_statistics", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "1091955035", 
-      "name" : "demo", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "190811", 
+      "id" : "172333", 
       "name" : "_configuration", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "1176889691", 
-      "name" : "vertices1", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "1002105179", 
-      "name" : "Customer", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "5499227", 
-      "name" : "_statistics15", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "1063905627", 
-      "name" : "relation", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    { 
-      "id" : "760146267", 
+      "id" : "757506349", 
       "name" : "better-example", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "4581723", 
-      "name" : "_aqlfunctions", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "2353499", 
-      "name" : "_modules", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "6351195", 
-      "name" : "_jobs", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    { 
-      "id" : "1002498395", 
+      "id" : "1000317229", 
       "name" : "Groceries", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "1087433051", 
+      "id" : "1085251885", 
       "name" : "frenchCity", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "7203163", 
+      "id" : "1089708333", 
+      "name" : "demo", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "5480749", 
+      "name" : "_statistics15", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "1061658925", 
+      "name" : "relation", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
+    { 
+      "id" : "4563245", 
+      "name" : "_aqlfunctions", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "2335021", 
+      "name" : "_modules", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "6332717", 
+      "name" : "_jobs", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "7184685", 
       "name" : "_apps", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "16509275", 
+      "id" : "1177198893", 
+      "name" : "edges2", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
+    { 
+      "id" : "16490797", 
       "name" : "_system_sessions_sessions", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "452955", 
+      "id" : "1000186157", 
+      "name" : "Company", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "1085120813", 
+      "name" : "germanHighway", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
+    { 
+      "id" : "1175822637", 
+      "name" : "vertices1", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "1061527853", 
+      "name" : "male", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "434477", 
       "name" : "_users", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "2222427", 
+      "id" : "1000579373", 
+      "name" : "has_bought", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
+    { 
+      "id" : "2203949", 
       "name" : "_graphs", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "6220123", 
+      "id" : "6201645", 
       "name" : "_queues", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
     { 
-      "id" : "1002367323", 
-      "name" : "Company", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    } 
-  ], 
-  "names" : { 
-    "germanHighway" : { 
-      "id" : "1087301979", 
-      "name" : "germanHighway", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    "male" : { 
-      "id" : "1063709019", 
-      "name" : "male", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "_cluster_kickstarter_plans" : { 
-      "id" : "2615643", 
-      "name" : "_cluster_kickstarter_plans", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "has_bought" : { 
-      "id" : "1002760539", 
-      "name" : "has_bought", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    "internationalHighway" : { 
-      "id" : "1087695195", 
+      "id" : "1085514029", 
       "name" : "internationalHighway", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 3 
     }, 
-    "friend_of" : { 
-      "id" : "1002236251", 
+    { 
+      "id" : "2597165", 
+      "name" : "_cluster_kickstarter_plans", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "1000055085", 
       "name" : "friend_of", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 3 
     }, 
-    "germanCity" : { 
-      "id" : "1087170907", 
+    { 
+      "id" : "1084989741", 
       "name" : "germanCity", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "geo" : { 
-      "id" : "806545755", 
-      "name" : "geo", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "female" : { 
-      "id" : "1063577947", 
+    { 
+      "id" : "1061396781", 
       "name" : "female", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "_statisticsRaw" : { 
-      "id" : "4712795", 
-      "name" : "_statisticsRaw", 
-      "isSystem" : true, 
+    { 
+      "id" : "803905837", 
+      "name" : "geo", 
+      "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "_routing" : { 
-      "id" : "2484571", 
-      "name" : "_routing", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "Electronics" : { 
-      "id" : "1002629467", 
+    { 
+      "id" : "1000448301", 
       "name" : "Electronics", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "frenchHighway" : { 
-      "id" : "1087564123", 
+    { 
+      "id" : "1085382957", 
       "name" : "frenchHighway", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 3 
     }, 
-    "edges2" : { 
-      "id" : "1178265947", 
-      "name" : "edges2", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
-    "animals" : { 
-      "id" : "1092872539", 
-      "name" : "animals", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "_statistics" : { 
-      "id" : "5106011", 
-      "name" : "_statistics", 
+    { 
+      "id" : "4694317", 
+      "name" : "_statisticsRaw", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "demo" : { 
-      "id" : "1091955035", 
-      "name" : "demo", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "_configuration" : { 
-      "id" : "190811", 
-      "name" : "_configuration", 
+    { 
+      "id" : "2466093", 
+      "name" : "_routing", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "vertices1" : { 
-      "id" : "1176889691", 
-      "name" : "vertices1", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "Customer" : { 
-      "id" : "1002105179", 
+    { 
+      "id" : "999924013", 
       "name" : "Customer", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "_statistics15" : { 
-      "id" : "5499227", 
-      "name" : "_statistics15", 
+    { 
+      "id" : "1090625837", 
+      "name" : "animals", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    { 
+      "id" : "5087533", 
+      "name" : "_statistics", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    } 
+  ], 
+  "names" : { 
+    "_configuration" : { 
+      "id" : "172333", 
+      "name" : "_configuration", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "relation" : { 
-      "id" : "1063905627", 
-      "name" : "relation", 
-      "isSystem" : false, 
-      "status" : 3, 
-      "type" : 3 
-    }, 
     "better-example" : { 
-      "id" : "760146267", 
+      "id" : "757506349", 
       "name" : "better-example", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "_aqlfunctions" : { 
-      "id" : "4581723", 
-      "name" : "_aqlfunctions", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "_modules" : { 
-      "id" : "2353499", 
-      "name" : "_modules", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
-    "_jobs" : { 
-      "id" : "6351195", 
-      "name" : "_jobs", 
-      "isSystem" : true, 
-      "status" : 3, 
-      "type" : 2 
-    }, 
     "Groceries" : { 
-      "id" : "1002498395", 
+      "id" : "1000317229", 
       "name" : "Groceries", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
     "frenchCity" : { 
-      "id" : "1087433051", 
+      "id" : "1085251885", 
       "name" : "frenchCity", 
       "isSystem" : false, 
       "status" : 3, 
       "type" : 2 
     }, 
+    "demo" : { 
+      "id" : "1089708333", 
+      "name" : "demo", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "_statistics15" : { 
+      "id" : "5480749", 
+      "name" : "_statistics15", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "relation" : { 
+      "id" : "1061658925", 
+      "name" : "relation", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
+    "_aqlfunctions" : { 
+      "id" : "4563245", 
+      "name" : "_aqlfunctions", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "_modules" : { 
+      "id" : "2335021", 
+      "name" : "_modules", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "_jobs" : { 
+      "id" : "6332717", 
+      "name" : "_jobs", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
     "_apps" : { 
-      "id" : "7203163", 
+      "id" : "7184685", 
       "name" : "_apps", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
+    "edges2" : { 
+      "id" : "1177198893", 
+      "name" : "edges2", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
     "_system_sessions_sessions" : { 
-      "id" : "16509275", 
+      "id" : "16490797", 
       "name" : "_system_sessions_sessions", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
+    "Company" : { 
+      "id" : "1000186157", 
+      "name" : "Company", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "germanHighway" : { 
+      "id" : "1085120813", 
+      "name" : "germanHighway", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
+    "vertices1" : { 
+      "id" : "1175822637", 
+      "name" : "vertices1", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "male" : { 
+      "id" : "1061527853", 
+      "name" : "male", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
     "_users" : { 
-      "id" : "452955", 
+      "id" : "434477", 
       "name" : "_users", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
+    "has_bought" : { 
+      "id" : "1000579373", 
+      "name" : "has_bought", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
     "_graphs" : { 
-      "id" : "2222427", 
+      "id" : "2203949", 
       "name" : "_graphs", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
     "_queues" : { 
-      "id" : "6220123", 
+      "id" : "6201645", 
       "name" : "_queues", 
       "isSystem" : true, 
       "status" : 3, 
       "type" : 2 
     }, 
-    "Company" : { 
-      "id" : "1002367323", 
-      "name" : "Company", 
+    "internationalHighway" : { 
+      "id" : "1085514029", 
+      "name" : "internationalHighway", 
       "isSystem" : false, 
       "status" : 3, 
+      "type" : 3 
+    }, 
+    "_cluster_kickstarter_plans" : { 
+      "id" : "2597165", 
+      "name" : "_cluster_kickstarter_plans", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "friend_of" : { 
+      "id" : "1000055085", 
+      "name" : "friend_of", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
+    "germanCity" : { 
+      "id" : "1084989741", 
+      "name" : "germanCity", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "female" : { 
+      "id" : "1061396781", 
+      "name" : "female", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "geo" : { 
+      "id" : "803905837", 
+      "name" : "geo", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "Electronics" : { 
+      "id" : "1000448301", 
+      "name" : "Electronics", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "frenchHighway" : { 
+      "id" : "1085382957", 
+      "name" : "frenchHighway", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 3 
+    }, 
+    "_statisticsRaw" : { 
+      "id" : "4694317", 
+      "name" : "_statisticsRaw", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "_routing" : { 
+      "id" : "2466093", 
+      "name" : "_routing", 
+      "isSystem" : true, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "Customer" : { 
+      "id" : "999924013", 
+      "name" : "Customer", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "animals" : { 
+      "id" : "1090625837", 
+      "name" : "animals", 
+      "isSystem" : false, 
+      "status" : 3, 
+      "type" : 2 
+    }, 
+    "_statistics" : { 
+      "id" : "5087533", 
+      "name" : "_statistics", 
+      "isSystem" : true, 
+      "status" : 3, 
       "type" : 2 
     } 
   }, 
diff --git a/Documentation/Examples/RestCollectionGetCollectionChecksum.generated b/Documentation/Examples/RestCollectionGetCollectionChecksum.generated
index 742422f808..5415e6e9b5 100644
--- a/Documentation/Examples/RestCollectionGetCollectionChecksum.generated
+++ b/Documentation/Examples/RestCollectionGetCollectionChecksum.generated
@@ -4,13 +4,13 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1393813851", 
+  "id" : "1392025901", 
   "name" : "products", 
   "isSystem" : false, 
   "status" : 3, 
   "type" : 2, 
-  "checksum" : 3786187659, 
-  "revision" : "1394141531", 
+  "checksum" : 3140030282, 
+  "revision" : "1392353581", 
   "error" : false, 
   "code" : 200 
 }
diff --git a/Documentation/Examples/RestCollectionGetCollectionChecksumNoRev.generated b/Documentation/Examples/RestCollectionGetCollectionChecksumNoRev.generated
index fdb775fb75..c6f16faf7a 100644
--- a/Documentation/Examples/RestCollectionGetCollectionChecksumNoRev.generated
+++ b/Documentation/Examples/RestCollectionGetCollectionChecksumNoRev.generated
@@ -4,13 +4,13 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1394403675", 
+  "id" : "1392615725", 
   "name" : "products", 
   "isSystem" : false, 
   "status" : 3, 
   "type" : 2, 
-  "checksum" : 2239643493, 
-  "revision" : "1394731355", 
+  "checksum" : 2662522228, 
+  "revision" : "1392943405", 
   "error" : false, 
   "code" : 200 
 }
diff --git a/Documentation/Examples/RestCollectionGetCollectionCount.generated b/Documentation/Examples/RestCollectionGetCollectionCount.generated
index 5ef4d2224e..1850fad40c 100644
--- a/Documentation/Examples/RestCollectionGetCollectionCount.generated
+++ b/Documentation/Examples/RestCollectionGetCollectionCount.generated
@@ -5,7 +5,7 @@ content-type: application/json; charset=utf-8
 location: /_db/_system/_api/collection/products/count
 
 { 
-  "id" : "1371859291", 
+  "id" : "1370136877", 
   "name" : "products", 
   "isSystem" : false, 
   "doCompact" : true, 
diff --git a/Documentation/Examples/RestCollectionGetCollectionFigures.generated b/Documentation/Examples/RestCollectionGetCollectionFigures.generated
index 43347363cf..a7e2b22bdd 100644
--- a/Documentation/Examples/RestCollectionGetCollectionFigures.generated
+++ b/Documentation/Examples/RestCollectionGetCollectionFigures.generated
@@ -5,7 +5,7 @@ content-type: application/json; charset=utf-8
 location: /_db/_system/_api/collection/products/figures
 
 { 
-  "id" : "1392044379", 
+  "id" : "1390780717", 
   "name" : "products", 
   "isSystem" : false, 
   "doCompact" : true, 
@@ -55,7 +55,7 @@ location: /_db/_system/_api/collection/products/figures
       "count" : 1, 
       "size" : 2008 
     }, 
-    "lastTick" : "1392437595", 
+    "lastTick" : "1391173933", 
     "uncollectedLogfileEntries" : 0 
   }, 
   "status" : 3, 
diff --git a/Documentation/Examples/RestCollectionGetCollectionIdentifier.generated b/Documentation/Examples/RestCollectionGetCollectionIdentifier.generated
index 402c42e6ac..1a36ccb00b 100644
--- a/Documentation/Examples/RestCollectionGetCollectionIdentifier.generated
+++ b/Documentation/Examples/RestCollectionGetCollectionIdentifier.generated
@@ -1,11 +1,11 @@
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/collection/1371466075/properties
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/collection/1369743661/properties
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 location: /_db/_system/_api/collection/products/properties
 
 { 
-  "id" : "1371466075", 
+  "id" : "1369743661", 
   "name" : "products", 
   "isSystem" : false, 
   "doCompact" : true, 
diff --git a/Documentation/Examples/RestCollectionGetCollectionName.generated b/Documentation/Examples/RestCollectionGetCollectionName.generated
index 7de28297ce..282a8a69fe 100644
--- a/Documentation/Examples/RestCollectionGetCollectionName.generated
+++ b/Documentation/Examples/RestCollectionGetCollectionName.generated
@@ -5,7 +5,7 @@ content-type: application/json; charset=utf-8
 location: /_db/_system/_api/collection/products/properties
 
 { 
-  "id" : "1371662683", 
+  "id" : "1369940269", 
   "name" : "products", 
   "isSystem" : false, 
   "doCompact" : true, 
diff --git a/Documentation/Examples/RestCollectionGetCollectionRevision.generated b/Documentation/Examples/RestCollectionGetCollectionRevision.generated
index fcce4c73bd..33077d4389 100644
--- a/Documentation/Examples/RestCollectionGetCollectionRevision.generated
+++ b/Documentation/Examples/RestCollectionGetCollectionRevision.generated
@@ -4,7 +4,7 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1393551707", 
+  "id" : "1391763757", 
   "name" : "products", 
   "isSystem" : false, 
   "status" : 3, 
diff --git a/Documentation/Examples/RestCollectionIdentifierLoad.generated b/Documentation/Examples/RestCollectionIdentifierLoad.generated
index 67d7d4325a..c38eb4a7d5 100644
--- a/Documentation/Examples/RestCollectionIdentifierLoad.generated
+++ b/Documentation/Examples/RestCollectionIdentifierLoad.generated
@@ -4,7 +4,7 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1394993499", 
+  "id" : "1393205549", 
   "name" : "products", 
   "isSystem" : false, 
   "count" : 0, 
diff --git a/Documentation/Examples/RestCollectionIdentifierPropertiesSync.generated b/Documentation/Examples/RestCollectionIdentifierPropertiesSync.generated
index dd35d046cf..c3077276ee 100644
--- a/Documentation/Examples/RestCollectionIdentifierPropertiesSync.generated
+++ b/Documentation/Examples/RestCollectionIdentifierPropertiesSync.generated
@@ -7,7 +7,7 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1395714395", 
+  "id" : "1393926445", 
   "name" : "products", 
   "isSystem" : false, 
   "doCompact" : true, 
diff --git a/Documentation/Examples/RestCollectionIdentifierRename.generated b/Documentation/Examples/RestCollectionIdentifierRename.generated
index aa4ac7cb7e..0040747e12 100644
--- a/Documentation/Examples/RestCollectionIdentifierRename.generated
+++ b/Documentation/Examples/RestCollectionIdentifierRename.generated
@@ -7,7 +7,7 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1395976539", 
+  "id" : "1394188589", 
   "name" : "newname", 
   "isSystem" : false, 
   "status" : 3, 
diff --git a/Documentation/Examples/RestCollectionIdentifierTruncate.generated b/Documentation/Examples/RestCollectionIdentifierTruncate.generated
index 4af3688919..44bd19c482 100644
--- a/Documentation/Examples/RestCollectionIdentifierTruncate.generated
+++ b/Documentation/Examples/RestCollectionIdentifierTruncate.generated
@@ -4,7 +4,7 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1395452251", 
+  "id" : "1393664301", 
   "name" : "products", 
   "isSystem" : false, 
   "status" : 3, 
diff --git a/Documentation/Examples/RestCollectionIdentifierUnload.generated b/Documentation/Examples/RestCollectionIdentifierUnload.generated
index 77b97f694f..9d421c55b7 100644
--- a/Documentation/Examples/RestCollectionIdentifierUnload.generated
+++ b/Documentation/Examples/RestCollectionIdentifierUnload.generated
@@ -4,7 +4,7 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1395255643", 
+  "id" : "1393467693", 
   "name" : "products", 
   "isSystem" : false, 
   "status" : 4, 
diff --git a/Documentation/Examples/RestCursorCreateCursorForLimitReturn.generated b/Documentation/Examples/RestCursorCreateCursorForLimitReturn.generated
index bc103bd342..d3b7601b1a 100644
--- a/Documentation/Examples/RestCursorCreateCursorForLimitReturn.generated
+++ b/Documentation/Examples/RestCursorCreateCursorForLimitReturn.generated
@@ -7,20 +7,20 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1095952731", 
-      "_key" : "1095952731", 
-      "_rev" : "1095952731", 
-      "hello1" : "world1" 
+      "_id" : "products/1094689069", 
+      "_key" : "1094689069", 
+      "_rev" : "1094689069", 
+      "hello4" : "world1" 
     }, 
     { 
-      "_id" : "products/1096935771", 
-      "_key" : "1096935771", 
-      "_rev" : "1096935771", 
-      "hello4" : "world1" 
+      "_id" : "products/1094033709", 
+      "_key" : "1094033709", 
+      "_rev" : "1094033709", 
+      "hello2" : "world1" 
     } 
   ], 
   "hasMore" : true, 
-  "id" : "1097460059", 
+  "id" : "1095213357", 
   "count" : 5, 
   "extra" : { 
     "stats" : { 
diff --git a/Documentation/Examples/RestCursorCreateCursorForLimitReturnSingle.generated b/Documentation/Examples/RestCursorCreateCursorForLimitReturnSingle.generated
index 36a40ab1f3..14e1339451 100644
--- a/Documentation/Examples/RestCursorCreateCursorForLimitReturnSingle.generated
+++ b/Documentation/Examples/RestCursorCreateCursorForLimitReturnSingle.generated
@@ -7,16 +7,16 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1095362907", 
-      "_key" : "1095362907", 
-      "_rev" : "1095362907", 
-      "hello2" : "world1" 
+      "_id" : "products/1092788525", 
+      "_key" : "1092788525", 
+      "_rev" : "1092788525", 
+      "hello1" : "world1" 
     }, 
     { 
-      "_id" : "products/1095035227", 
-      "_key" : "1095035227", 
-      "_rev" : "1095035227", 
-      "hello1" : "world1" 
+      "_id" : "products/1093116205", 
+      "_key" : "1093116205", 
+      "_rev" : "1093116205", 
+      "hello2" : "world1" 
     } 
   ], 
   "hasMore" : false, 
diff --git a/Documentation/Examples/RestCursorDelete.generated b/Documentation/Examples/RestCursorDelete.generated
index 92bb299e07..713ffde32a 100644
--- a/Documentation/Examples/RestCursorDelete.generated
+++ b/Documentation/Examples/RestCursorDelete.generated
@@ -7,20 +7,20 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1102506331", 
-      "_key" : "1102506331", 
-      "_rev" : "1102506331", 
-      "hello1" : "world1" 
+      "_id" : "products/1100587309", 
+      "_key" : "1100587309", 
+      "_rev" : "1100587309", 
+      "hello2" : "world1" 
     }, 
     { 
-      "_id" : "products/1103489371", 
-      "_key" : "1103489371", 
-      "_rev" : "1103489371", 
-      "hello4" : "world1" 
+      "_id" : "products/1100914989", 
+      "_key" : "1100914989", 
+      "_rev" : "1100914989", 
+      "hello3" : "world1" 
     } 
   ], 
   "hasMore" : true, 
-  "id" : "1104013659", 
+  "id" : "1101766957", 
   "count" : 5, 
   "extra" : { 
     "stats" : { 
@@ -34,5 +34,5 @@ content-type: application/json; charset=utf-8
   "error" : false, 
   "code" : 201 
 }
-shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/cursor/1104013659
+shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/cursor/1101766957
 
diff --git a/Documentation/Examples/RestCursorForLimitReturnCont.generated b/Documentation/Examples/RestCursorForLimitReturnCont.generated
index 2d55e947b9..c5be6fc734 100644
--- a/Documentation/Examples/RestCursorForLimitReturnCont.generated
+++ b/Documentation/Examples/RestCursorForLimitReturnCont.generated
@@ -1,7 +1,7 @@
 shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/cursor
 {"query":"FOR p IN products LIMIT 5 RETURN p","count":true,"batchSize":2}
 
-shell> curl -X PUT --dump - http://localhost:8529/_api/cursor/1102047579
+shell> curl -X PUT --dump - http://localhost:8529/_api/cursor/1099800877
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
@@ -9,20 +9,20 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1101850971", 
-      "_key" : "1101850971", 
-      "_rev" : "1101850971", 
+      "_id" : "products/1099604269", 
+      "_key" : "1099604269", 
+      "_rev" : "1099604269", 
       "hello5" : "world1" 
     }, 
     { 
-      "_id" : "products/1101523291", 
-      "_key" : "1101523291", 
-      "_rev" : "1101523291", 
+      "_id" : "products/1099276589", 
+      "_key" : "1099276589", 
+      "_rev" : "1099276589", 
       "hello4" : "world1" 
     } 
   ], 
   "hasMore" : true, 
-  "id" : "1102047579", 
+  "id" : "1099800877", 
   "count" : 5, 
   "extra" : { 
     "stats" : { 
diff --git a/Documentation/Examples/RestDatabaseGetInfo.generated b/Documentation/Examples/RestDatabaseGetInfo.generated
index 8630d0905d..a5f99fba9d 100644
--- a/Documentation/Examples/RestDatabaseGetInfo.generated
+++ b/Documentation/Examples/RestDatabaseGetInfo.generated
@@ -6,8 +6,8 @@ content-type: application/json; charset=utf-8
 { 
   "result" : { 
     "name" : "_system", 
-    "id" : "125275", 
-    "path" : "/tmp/vocdir.18548/databases/database-125275", 
+    "id" : "106797", 
+    "path" : "/tmp/vocdir.26883/databases/database-106797", 
     "isSystem" : true 
   }, 
   "error" : false, 
diff --git a/Documentation/Examples/RestDocumentHandlerDeleteDocument.generated b/Documentation/Examples/RestDocumentHandlerDeleteDocument.generated
index ed6231723e..2d3eb7a6a8 100644
--- a/Documentation/Examples/RestDocumentHandlerDeleteDocument.generated
+++ b/Documentation/Examples/RestDocumentHandlerDeleteDocument.generated
@@ -1,11 +1,11 @@
-shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/document/products/1522723163
+shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/document/products/1522049325
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
   "error" : false, 
-  "_id" : "products/1522723163", 
-  "_rev" : "1522723163", 
-  "_key" : "1522723163" 
+  "_id" : "products/1522049325", 
+  "_rev" : "1522049325", 
+  "_key" : "1522049325" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerDeleteDocumentIfMatchOther.generated b/Documentation/Examples/RestDocumentHandlerDeleteDocumentIfMatchOther.generated
index ed2dce5921..e9abbc98ec 100644
--- a/Documentation/Examples/RestDocumentHandlerDeleteDocumentIfMatchOther.generated
+++ b/Documentation/Examples/RestDocumentHandlerDeleteDocumentIfMatchOther.generated
@@ -1,15 +1,15 @@
-shell> curl -X DELETE --header 'If-Match: "1524623707"' --dump - http://localhost:8529/_api/document/products/1524296027
+shell> curl -X DELETE --header 'If-Match: "1523949869"' --dump - http://localhost:8529/_api/document/products/1523622189
 
 HTTP/1.1 412 Precondition Failed
 content-type: application/json; charset=utf-8
-etag: "1524296027"
+etag: "1523622189"
 
 { 
   "error" : true, 
   "code" : 412, 
   "errorNum" : 1200, 
   "errorMessage" : "precondition failed", 
-  "_id" : "products/1524296027", 
-  "_rev" : "1524296027", 
-  "_key" : "1524296027" 
+  "_id" : "products/1523622189", 
+  "_rev" : "1523622189", 
+  "_key" : "1523622189" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerDeleteDocumentUnknownHandle.generated b/Documentation/Examples/RestDocumentHandlerDeleteDocumentUnknownHandle.generated
index 08ad75502a..6f262a621c 100644
--- a/Documentation/Examples/RestDocumentHandlerDeleteDocumentUnknownHandle.generated
+++ b/Documentation/Examples/RestDocumentHandlerDeleteDocumentUnknownHandle.generated
@@ -1,11 +1,11 @@
-shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/document/products/1523444059
+shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/document/products/1522770221
 
 HTTP/1.1 404 Not Found
 content-type: application/json; charset=utf-8
 
 { 
   "error" : true, 
-  "errorMessage" : "document /_api/document/products/1523444059 not found", 
+  "errorMessage" : "document /_api/document/products/1522770221 not found", 
   "code" : 404, 
   "errorNum" : 1202 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerPatchDocument.generated b/Documentation/Examples/RestDocumentHandlerPatchDocument.generated
index 691c2c7abf..3fe0ee4848 100644
--- a/Documentation/Examples/RestDocumentHandlerPatchDocument.generated
+++ b/Documentation/Examples/RestDocumentHandlerPatchDocument.generated
@@ -1,20 +1,20 @@
-shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1518922075
+shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1518182701
 { 
   "hello" : "world" 
 }
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1519249755"
-location: /_db/_system/_api/document/products/1518922075
+etag: "1518510381"
+location: /_db/_system/_api/document/products/1518182701
 
 { 
   "error" : false, 
-  "_id" : "products/1518922075", 
-  "_rev" : "1519249755", 
-  "_key" : "1518922075" 
+  "_id" : "products/1518182701", 
+  "_rev" : "1518510381", 
+  "_key" : "1518182701" 
 }
-shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1518922075
+shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1518182701
 { 
   "numbers" : { 
     "one" : 1, 
@@ -26,20 +26,20 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/docume
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1519839579"
-location: /_db/_system/_api/document/products/1518922075
+etag: "1519100205"
+location: /_db/_system/_api/document/products/1518182701
 
 { 
   "error" : false, 
-  "_id" : "products/1518922075", 
-  "_rev" : "1519839579", 
-  "_key" : "1518922075" 
+  "_id" : "products/1518182701", 
+  "_rev" : "1519100205", 
+  "_key" : "1518182701" 
 }
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1518922075
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1518182701
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: "1519839579"
+etag: "1519100205"
 
 { 
   "one" : "world", 
@@ -50,11 +50,11 @@ etag: "1519839579"
     "two" : 2, 
     "three" : 3 
   }, 
-  "_id" : "products/1518922075", 
-  "_rev" : "1519839579", 
-  "_key" : "1518922075" 
+  "_id" : "products/1518182701", 
+  "_rev" : "1519100205", 
+  "_key" : "1518182701" 
 }
-shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1518922075?keepNull=false
+shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1518182701?keepNull=false
 { 
   "hello" : null, 
   "numbers" : { 
@@ -64,20 +64,20 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/docume
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1520298331"
-location: /_db/_system/_api/document/products/1518922075
+etag: "1519624493"
+location: /_db/_system/_api/document/products/1518182701
 
 { 
   "error" : false, 
-  "_id" : "products/1518922075", 
-  "_rev" : "1520298331", 
-  "_key" : "1518922075" 
+  "_id" : "products/1518182701", 
+  "_rev" : "1519624493", 
+  "_key" : "1518182701" 
 }
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1518922075
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1518182701
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: "1520298331"
+etag: "1519624493"
 
 { 
   "one" : "world", 
@@ -88,7 +88,7 @@ etag: "1520298331"
     "three" : 3, 
     "four" : 4 
   }, 
-  "_id" : "products/1518922075", 
-  "_rev" : "1520298331", 
-  "_key" : "1518922075" 
+  "_id" : "products/1518182701", 
+  "_rev" : "1519624493", 
+  "_key" : "1518182701" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerPatchDocumentMerge.generated b/Documentation/Examples/RestDocumentHandlerPatchDocumentMerge.generated
index 9ac0b9e6c3..0834353dd0 100644
--- a/Documentation/Examples/RestDocumentHandlerPatchDocumentMerge.generated
+++ b/Documentation/Examples/RestDocumentHandlerPatchDocumentMerge.generated
@@ -1,8 +1,8 @@
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1521150299
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1520476461
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: "1521150299"
+etag: "1520476461"
 
 { 
   "inhabitants" : { 
@@ -10,11 +10,11 @@ etag: "1521150299"
     "india" : 1263590000, 
     "usa" : 319220000 
   }, 
-  "_id" : "products/1521150299", 
-  "_rev" : "1521150299", 
-  "_key" : "1521150299" 
+  "_id" : "products/1520476461", 
+  "_rev" : "1520476461", 
+  "_key" : "1520476461" 
 }
-shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1521150299?mergeObjects=true
+shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1520476461?mergeObjects=true
 { 
   "inhabitants" : { 
     "indonesia" : 252164800, 
@@ -22,11 +22,11 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/docume
   } 
 }
 
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1521150299
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1520476461
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: "1521674587"
+etag: "1521000749"
 
 { 
   "inhabitants" : { 
@@ -36,11 +36,11 @@ etag: "1521674587"
     "indonesia" : 252164800, 
     "brazil" : 203553000 
   }, 
-  "_id" : "products/1521150299", 
-  "_rev" : "1521674587", 
-  "_key" : "1521150299" 
+  "_id" : "products/1520476461", 
+  "_rev" : "1521000749", 
+  "_key" : "1520476461" 
 }
-shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1521150299?mergeObjects=false
+shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/document/products/1520476461?mergeObjects=false
 { 
   "inhabitants" : { 
     "pakistan" : 188346000 
@@ -49,26 +49,26 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/docume
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1522133339"
-location: /_db/_system/_api/document/products/1521150299
+etag: "1521459501"
+location: /_db/_system/_api/document/products/1520476461
 
 { 
   "error" : false, 
-  "_id" : "products/1521150299", 
-  "_rev" : "1522133339", 
-  "_key" : "1521150299" 
+  "_id" : "products/1520476461", 
+  "_rev" : "1521459501", 
+  "_key" : "1520476461" 
 }
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1521150299
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1520476461
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: "1522133339"
+etag: "1521459501"
 
 { 
   "inhabitants" : { 
     "pakistan" : 188346000 
   }, 
-  "_id" : "products/1521150299", 
-  "_rev" : "1522133339", 
-  "_key" : "1521150299" 
+  "_id" : "products/1520476461", 
+  "_rev" : "1521459501", 
+  "_key" : "1520476461" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerPostAccept1.generated b/Documentation/Examples/RestDocumentHandlerPostAccept1.generated
index f65c4f454e..0ea106c4e0 100644
--- a/Documentation/Examples/RestDocumentHandlerPostAccept1.generated
+++ b/Documentation/Examples/RestDocumentHandlerPostAccept1.generated
@@ -3,12 +3,12 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/documen
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1507846491"
-location: /_db/_system/_api/document/products/1507846491
+etag: "1507172653"
+location: /_db/_system/_api/document/products/1507172653
 
 { 
   "error" : false, 
-  "_id" : "products/1507846491", 
-  "_rev" : "1507846491", 
-  "_key" : "1507846491" 
+  "_id" : "products/1507172653", 
+  "_rev" : "1507172653", 
+  "_key" : "1507172653" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerPostCreate1.generated b/Documentation/Examples/RestDocumentHandlerPostCreate1.generated
index 031b5eead4..17b28a4c86 100644
--- a/Documentation/Examples/RestDocumentHandlerPostCreate1.generated
+++ b/Documentation/Examples/RestDocumentHandlerPostCreate1.generated
@@ -3,12 +3,12 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/documen
 
 HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
-etag: "1507322203"
-location: /_db/_system/_api/document/products/1507322203
+etag: "1506648365"
+location: /_db/_system/_api/document/products/1506648365
 
 { 
   "error" : false, 
-  "_id" : "products/1507322203", 
-  "_rev" : "1507322203", 
-  "_key" : "1507322203" 
+  "_id" : "products/1506648365", 
+  "_rev" : "1506648365", 
+  "_key" : "1506648365" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerPostCreate2.generated b/Documentation/Examples/RestDocumentHandlerPostCreate2.generated
index 35e8269b17..3516a5453c 100644
--- a/Documentation/Examples/RestDocumentHandlerPostCreate2.generated
+++ b/Documentation/Examples/RestDocumentHandlerPostCreate2.generated
@@ -3,12 +3,12 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/documen
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1508895067"
-location: /_db/_system/_api/document/products/1508895067
+etag: "1508221229"
+location: /_db/_system/_api/document/products/1508221229
 
 { 
   "error" : false, 
-  "_id" : "products/1508895067", 
-  "_rev" : "1508895067", 
-  "_key" : "1508895067" 
+  "_id" : "products/1508221229", 
+  "_rev" : "1508221229", 
+  "_key" : "1508221229" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerPostWait1.generated b/Documentation/Examples/RestDocumentHandlerPostWait1.generated
index ef6b6ec536..94628972e0 100644
--- a/Documentation/Examples/RestDocumentHandlerPostWait1.generated
+++ b/Documentation/Examples/RestDocumentHandlerPostWait1.generated
@@ -3,12 +3,12 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/documen
 
 HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
-etag: "1508370779"
-location: /_db/_system/_api/document/products/1508370779
+etag: "1507696941"
+location: /_db/_system/_api/document/products/1507696941
 
 { 
   "error" : false, 
-  "_id" : "products/1508370779", 
-  "_rev" : "1508370779", 
-  "_key" : "1508370779" 
+  "_id" : "products/1507696941", 
+  "_rev" : "1507696941", 
+  "_key" : "1507696941" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerReadDocument.generated b/Documentation/Examples/RestDocumentHandlerReadDocument.generated
index d8361233ae..bffc6edf3b 100644
--- a/Documentation/Examples/RestDocumentHandlerReadDocument.generated
+++ b/Documentation/Examples/RestDocumentHandlerReadDocument.generated
@@ -1,12 +1,12 @@
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1509419355
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/document/products/1508745517
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: "1509419355"
+etag: "1508745517"
 
 { 
   "hello" : "world", 
-  "_id" : "products/1509419355", 
-  "_rev" : "1509419355", 
-  "_key" : "1509419355" 
+  "_id" : "products/1508745517", 
+  "_rev" : "1508745517", 
+  "_key" : "1508745517" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerReadDocumentAllKey.generated b/Documentation/Examples/RestDocumentHandlerReadDocumentAllKey.generated
index c3e52db507..e8b735e934 100644
--- a/Documentation/Examples/RestDocumentHandlerReadDocumentAllKey.generated
+++ b/Documentation/Examples/RestDocumentHandlerReadDocumentAllKey.generated
@@ -5,8 +5,8 @@ content-type: application/json; charset=utf-8
 
 { 
   "documents" : [ 
-    "1512565083", 
-    "1512237403", 
-    "1511909723" 
+    "1511891245", 
+    "1511235885", 
+    "1511563565" 
   ] 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerReadDocumentAllPath.generated b/Documentation/Examples/RestDocumentHandlerReadDocumentAllPath.generated
index 7a361d5e8a..f04818e84b 100644
--- a/Documentation/Examples/RestDocumentHandlerReadDocumentAllPath.generated
+++ b/Documentation/Examples/RestDocumentHandlerReadDocumentAllPath.generated
@@ -5,8 +5,8 @@ content-type: application/json; charset=utf-8
 
 { 
   "documents" : [ 
-    "/_api/document/products/1510992219", 
-    "/_api/document/products/1510664539", 
-    "/_api/document/products/1511319899" 
+    "/_api/document/products/1510646061", 
+    "/_api/document/products/1509990701", 
+    "/_api/document/products/1510318381" 
   ] 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerReadDocumentHead.generated b/Documentation/Examples/RestDocumentHandlerReadDocumentHead.generated
index b62cd1d8b5..a224289d37 100644
--- a/Documentation/Examples/RestDocumentHandlerReadDocumentHead.generated
+++ b/Documentation/Examples/RestDocumentHandlerReadDocumentHead.generated
@@ -1,2 +1,2 @@
-shell> curl -X HEAD --data-binary @- --dump - http://localhost:8529/_api/document/products/1513154907
+shell> curl -X HEAD --data-binary @- --dump - http://localhost:8529/_api/document/products/1512481069
 
diff --git a/Documentation/Examples/RestDocumentHandlerReadDocumentIfNoneMatch.generated b/Documentation/Examples/RestDocumentHandlerReadDocumentIfNoneMatch.generated
index bcc77831fe..398e81e5f8 100644
--- a/Documentation/Examples/RestDocumentHandlerReadDocumentIfNoneMatch.generated
+++ b/Documentation/Examples/RestDocumentHandlerReadDocumentIfNoneMatch.generated
@@ -1,2 +1,2 @@
-shell> curl --header 'If-None-Match: "1510009179"' --dump - http://localhost:8529/_api/document/products/1510009179
+shell> curl --header 'If-None-Match: "1509335341"' --dump - http://localhost:8529/_api/document/products/1509335341
 
diff --git a/Documentation/Examples/RestDocumentHandlerUpdateDocument.generated b/Documentation/Examples/RestDocumentHandlerUpdateDocument.generated
index eeb1ad34c2..8f7dfcf440 100644
--- a/Documentation/Examples/RestDocumentHandlerUpdateDocument.generated
+++ b/Documentation/Examples/RestDocumentHandlerUpdateDocument.generated
@@ -1,14 +1,14 @@
-shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/document/products/1513744731
+shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/document/products/1513070893
 {"Hello": "you"}
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1514072411"
-location: /_db/_system/_api/document/products/1513744731
+etag: "1513398573"
+location: /_db/_system/_api/document/products/1513070893
 
 { 
   "error" : false, 
-  "_id" : "products/1513744731", 
-  "_rev" : "1514072411", 
-  "_key" : "1513744731" 
+  "_id" : "products/1513070893", 
+  "_rev" : "1513398573", 
+  "_key" : "1513070893" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOther.generated b/Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOther.generated
index 9add4a8f91..2b846d70ce 100644
--- a/Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOther.generated
+++ b/Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOther.generated
@@ -1,16 +1,16 @@
-shell> curl -X PUT --header 'If-Match: "1515841883"' --data-binary @- --dump - http://localhost:8529/_api/document/products/1515514203
+shell> curl -X PUT --header 'If-Match: "1515168045"' --data-binary @- --dump - http://localhost:8529/_api/document/products/1514840365
 {"other":"content"}
 
 HTTP/1.1 412 Precondition Failed
 content-type: application/json; charset=utf-8
-etag: "1515514203"
+etag: "1514840365"
 
 { 
   "error" : true, 
   "code" : 412, 
   "errorNum" : 1200, 
   "errorMessage" : "precondition failed", 
-  "_id" : "products/1515514203", 
-  "_rev" : "1515514203", 
-  "_key" : "1515514203" 
+  "_id" : "products/1514840365", 
+  "_rev" : "1514840365", 
+  "_key" : "1514840365" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOtherLastWriteWins.generated b/Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOtherLastWriteWins.generated
index 9bcf479b50..08e040aeff 100644
--- a/Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOtherLastWriteWins.generated
+++ b/Documentation/Examples/RestDocumentHandlerUpdateDocumentIfMatchOtherLastWriteWins.generated
@@ -1,14 +1,14 @@
-shell> curl -X PUT --header 'If-Match: "1516955995"' --data-binary @- --dump - http://localhost:8529/_api/document/products/1516628315?policy=last
+shell> curl -X PUT --header 'If-Match: "1516282157"' --data-binary @- --dump - http://localhost:8529/_api/document/products/1515954477?policy=last
 {}
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1517218139"
-location: /_db/_system/_api/document/products/1516628315
+etag: "1516544301"
+location: /_db/_system/_api/document/products/1515954477
 
 { 
   "error" : false, 
-  "_id" : "products/1516628315", 
-  "_rev" : "1517218139", 
-  "_key" : "1516628315" 
+  "_id" : "products/1515954477", 
+  "_rev" : "1516544301", 
+  "_key" : "1515954477" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerUpdateDocumentRevOther.generated b/Documentation/Examples/RestDocumentHandlerUpdateDocumentRevOther.generated
index ac1df67ee4..e807a96346 100644
--- a/Documentation/Examples/RestDocumentHandlerUpdateDocumentRevOther.generated
+++ b/Documentation/Examples/RestDocumentHandlerUpdateDocumentRevOther.generated
@@ -1,16 +1,16 @@
-shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/document/products/1517807963?rev=1518135643
+shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/document/products/1517068589?rev=1517396269
 {"other":"content"}
 
 HTTP/1.1 412 Precondition Failed
 content-type: application/json; charset=utf-8
-etag: "1517807963"
+etag: "1517068589"
 
 { 
   "error" : true, 
   "code" : 412, 
   "errorNum" : 1200, 
   "errorMessage" : "precondition failed", 
-  "_id" : "products/1517807963", 
-  "_rev" : "1517807963", 
-  "_key" : "1517807963" 
+  "_id" : "products/1517068589", 
+  "_rev" : "1517068589", 
+  "_key" : "1517068589" 
 }
diff --git a/Documentation/Examples/RestDocumentHandlerUpdateDocumentUnknownHandle.generated b/Documentation/Examples/RestDocumentHandlerUpdateDocumentUnknownHandle.generated
index f1679423b4..aee54fe6b5 100644
--- a/Documentation/Examples/RestDocumentHandlerUpdateDocumentUnknownHandle.generated
+++ b/Documentation/Examples/RestDocumentHandlerUpdateDocumentUnknownHandle.generated
@@ -1,4 +1,4 @@
-shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/document/products/1514596699
+shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/document/products/1513922861
 {}
 
 HTTP/1.1 404 Not Found
@@ -6,7 +6,7 @@ content-type: application/json; charset=utf-8
 
 { 
   "error" : true, 
-  "errorMessage" : "document /_api/document/products/1514596699 not found", 
+  "errorMessage" : "document /_api/document/products/1513922861 not found", 
   "code" : 404, 
   "errorNum" : 1202 
 }
diff --git a/Documentation/Examples/RestEdgeCreateEdge.generated b/Documentation/Examples/RestEdgeCreateEdge.generated
index 28ebf0d07f..e366b1d22f 100644
--- a/Documentation/Examples/RestEdgeCreateEdge.generated
+++ b/Documentation/Examples/RestEdgeCreateEdge.generated
@@ -5,26 +5,26 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/edge/?c
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: "1526917467"
-location: /_db/_system/_api/document/edges/1526917467
+etag: "1526243629"
+location: /_db/_system/_api/document/edges/1526243629
 
 { 
   "error" : false, 
-  "_id" : "edges/1526917467", 
-  "_rev" : "1526917467", 
-  "_key" : "1526917467" 
+  "_id" : "edges/1526243629", 
+  "_rev" : "1526243629", 
+  "_key" : "1526243629" 
 }
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/edge/edges/1526917467
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/edge/edges/1526243629
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: "1526917467"
+etag: "1526243629"
 
 { 
   "name" : "Emil", 
-  "_id" : "edges/1526917467", 
-  "_rev" : "1526917467", 
-  "_key" : "1526917467", 
+  "_id" : "edges/1526243629", 
+  "_rev" : "1526243629", 
+  "_key" : "1526243629", 
   "_from" : "vertices/1", 
   "_to" : "vertices/2" 
 }
diff --git a/Documentation/Examples/RestEdgesReadEdgesAny.generated b/Documentation/Examples/RestEdgesReadEdgesAny.generated
index f58c279f77..14f28a359a 100644
--- a/Documentation/Examples/RestEdgesReadEdgesAny.generated
+++ b/Documentation/Examples/RestEdgesReadEdgesAny.generated
@@ -8,7 +8,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/6", 
       "_key" : "6", 
-      "_rev" : "1154541915", 
+      "_rev" : "1153474861", 
       "_from" : "vertices/2", 
       "_to" : "vertices/1", 
       "$label" : "v2 -> v1" 
@@ -16,7 +16,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/7", 
       "_key" : "7", 
-      "_rev" : "1155066203", 
+      "_rev" : "1153999149", 
       "_from" : "vertices/4", 
       "_to" : "vertices/1", 
       "$label" : "v4 -> v1" 
@@ -24,7 +24,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/5", 
       "_key" : "5", 
-      "_rev" : "1154017627", 
+      "_rev" : "1152950573", 
       "_from" : "vertices/1", 
       "_to" : "vertices/3", 
       "$label" : "v1 -> v3" 
diff --git a/Documentation/Examples/RestEdgesReadEdgesIn.generated b/Documentation/Examples/RestEdgesReadEdgesIn.generated
index a049895ef7..f2e6b0e7bc 100644
--- a/Documentation/Examples/RestEdgesReadEdgesIn.generated
+++ b/Documentation/Examples/RestEdgesReadEdgesIn.generated
@@ -8,7 +8,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/6", 
       "_key" : "6", 
-      "_rev" : "1159260507", 
+      "_rev" : "1158193453", 
       "_from" : "vertices/2", 
       "_to" : "vertices/1", 
       "$label" : "v2 -> v1" 
@@ -16,7 +16,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/7", 
       "_key" : "7", 
-      "_rev" : "1159784795", 
+      "_rev" : "1158717741", 
       "_from" : "vertices/4", 
       "_to" : "vertices/1", 
       "$label" : "v4 -> v1" 
diff --git a/Documentation/Examples/RestEdgesReadEdgesOut.generated b/Documentation/Examples/RestEdgesReadEdgesOut.generated
index 1e8a950ffb..d56c50bcba 100644
--- a/Documentation/Examples/RestEdgesReadEdgesOut.generated
+++ b/Documentation/Examples/RestEdgesReadEdgesOut.generated
@@ -8,7 +8,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/5", 
       "_key" : "5", 
-      "_rev" : "1163454811", 
+      "_rev" : "1162387757", 
       "_from" : "vertices/1", 
       "_to" : "vertices/3", 
       "$label" : "v1 -> v3" 
diff --git a/Documentation/Examples/RestEndpointGet.generated b/Documentation/Examples/RestEndpointGet.generated
index 9edb0037eb..7efc6d2b1a 100644
--- a/Documentation/Examples/RestEndpointGet.generated
+++ b/Documentation/Examples/RestEndpointGet.generated
@@ -5,7 +5,7 @@ content-type: application/json; charset=utf-8
 
 [ 
   { 
-    "endpoint" : "tcp://127.0.0.1:38548", 
+    "endpoint" : "tcp://127.0.0.1:36883", 
     "databases" : [ ] 
   }, 
   { 
diff --git a/Documentation/Examples/RestExplainAllPlans.generated b/Documentation/Examples/RestExplainAllPlans.generated
index 4f978bd204..cdcce6d872 100644
--- a/Documentation/Examples/RestExplainAllPlans.generated
+++ b/Documentation/Examples/RestExplainAllPlans.generated
@@ -53,7 +53,7 @@ content-type: application/json; charset=utf-8
           ], 
           "index" : { 
             "type" : "hash", 
-            "id" : "1172957531", 
+            "id" : "1171890477", 
             "unique" : false, 
             "sparse" : false, 
             "selectivityEstimate" : 1, 
diff --git a/Documentation/Examples/RestExplainOptimizerRules.generated b/Documentation/Examples/RestExplainOptimizerRules.generated
index ffbd221271..ff9ef681e9 100644
--- a/Documentation/Examples/RestExplainOptimizerRules.generated
+++ b/Documentation/Examples/RestExplainOptimizerRules.generated
@@ -33,7 +33,7 @@ content-type: application/json; charset=utf-8
         ], 
         "index" : { 
           "type" : "skiplist", 
-          "id" : "1167845723", 
+          "id" : "1166778669", 
           "unique" : false, 
           "sparse" : false, 
           "fields" : [ 
diff --git a/Documentation/Examples/RestExplainOptions.generated b/Documentation/Examples/RestExplainOptions.generated
index 08ba9ce7a3..5bde205fec 100644
--- a/Documentation/Examples/RestExplainOptions.generated
+++ b/Documentation/Examples/RestExplainOptions.generated
@@ -34,7 +34,7 @@ content-type: application/json; charset=utf-8
           ], 
           "index" : { 
             "type" : "skiplist", 
-            "id" : "1170401627", 
+            "id" : "1169334573", 
             "unique" : false, 
             "sparse" : false, 
             "fields" : [ 
diff --git a/Documentation/Examples/RestGraphChangeEdge.generated b/Documentation/Examples/RestGraphChangeEdge.generated
index d3ba599b1b..082ccdfe54 100644
--- a/Documentation/Examples/RestGraphChangeEdge.generated
+++ b/Documentation/Examples/RestGraphChangeEdge.generated
@@ -5,13 +5,13 @@ shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/graph/gr
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: 1221192027
+etag: 1219535149
 
 { 
   "edge" : { 
     "_id" : "edges/edge1", 
     "_key" : "edge1", 
-    "_rev" : "1221192027", 
+    "_rev" : "1219535149", 
     "_from" : "vertices/vert1", 
     "_to" : "vertices/vert2", 
     "$label" : null, 
diff --git a/Documentation/Examples/RestGraphChangeVertex.generated b/Documentation/Examples/RestGraphChangeVertex.generated
index b9dcc6b8e1..aba10de445 100644
--- a/Documentation/Examples/RestGraphChangeVertex.generated
+++ b/Documentation/Examples/RestGraphChangeVertex.generated
@@ -5,13 +5,13 @@ shell> curl -X PUT --data-binary @- --dump - http://localhost:8529/_api/graph/gr
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: 1190062427
+etag: 1188405549
 
 { 
   "vertex" : { 
     "_id" : "vertices/v1", 
     "_key" : "v1", 
-    "_rev" : "1190062427", 
+    "_rev" : "1188405549", 
     "optional1" : "val2" 
   }, 
   "error" : false, 
diff --git a/Documentation/Examples/RestGraphChangepEdge.generated b/Documentation/Examples/RestGraphChangepEdge.generated
index a3a9402d32..52434c05cc 100644
--- a/Documentation/Examples/RestGraphChangepEdge.generated
+++ b/Documentation/Examples/RestGraphChangepEdge.generated
@@ -5,13 +5,13 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/graph/
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: 1224730971
+etag: 1223074093
 
 { 
   "edge" : { 
     "_id" : "edges/edge1", 
     "_key" : "edge1", 
-    "_rev" : "1224730971", 
+    "_rev" : "1223074093", 
     "_from" : "vertices/vert1", 
     "_to" : "vertices/vert2", 
     "$label" : null, 
diff --git a/Documentation/Examples/RestGraphChangepVertex.generated b/Documentation/Examples/RestGraphChangepVertex.generated
index 8771eed4d8..2ecbca3b36 100644
--- a/Documentation/Examples/RestGraphChangepVertex.generated
+++ b/Documentation/Examples/RestGraphChangepVertex.generated
@@ -5,13 +5,13 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/graph/
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: 1192421723
+etag: 1190764845
 
 { 
   "vertex" : { 
     "_id" : "vertices/v1", 
     "_key" : "v1", 
-    "_rev" : "1192421723", 
+    "_rev" : "1190764845", 
     "optional1" : "vertexPatch" 
   }, 
   "error" : false, 
@@ -24,13 +24,13 @@ shell> curl -X PATCH --data-binary @- --dump - http://localhost:8529/_api/graph/
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: 1192946011
+etag: 1191289133
 
 { 
   "vertex" : { 
     "_id" : "vertices/v1", 
     "_key" : "v1", 
-    "_rev" : "1192946011", 
+    "_rev" : "1191289133", 
     "optional1" : null 
   }, 
   "error" : false, 
diff --git a/Documentation/Examples/RestGraphCreateEdge.generated b/Documentation/Examples/RestGraphCreateEdge.generated
index 14737a1307..42cd565de1 100644
--- a/Documentation/Examples/RestGraphCreateEdge.generated
+++ b/Documentation/Examples/RestGraphCreateEdge.generated
@@ -8,13 +8,13 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/graph/g
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: 1211296091
+etag: 1209639213
 
 { 
   "edge" : { 
     "_id" : "edges/edge1", 
     "_key" : "edge1", 
-    "_rev" : "1211296091", 
+    "_rev" : "1209639213", 
     "_from" : "vertices/vert2", 
     "_to" : "vertices/vert1", 
     "$label" : null, 
diff --git a/Documentation/Examples/RestGraphCreateVertex.generated b/Documentation/Examples/RestGraphCreateVertex.generated
index c7dd00cd4e..40890d96cc 100644
--- a/Documentation/Examples/RestGraphCreateVertex.generated
+++ b/Documentation/Examples/RestGraphCreateVertex.generated
@@ -6,13 +6,13 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/graph/g
 
 HTTP/1.1 202 Accepted
 content-type: application/json; charset=utf-8
-etag: 1182853467
+etag: 1181786413
 
 { 
   "vertex" : { 
     "_id" : "vertices/v1", 
     "_key" : "v1", 
-    "_rev" : "1182853467", 
+    "_rev" : "1181786413", 
     "optional1" : "val1" 
   }, 
   "error" : false, 
diff --git a/Documentation/Examples/RestGraphGetEdge.generated b/Documentation/Examples/RestGraphGetEdge.generated
index e7d2bc0177..ca60697bd3 100644
--- a/Documentation/Examples/RestGraphGetEdge.generated
+++ b/Documentation/Examples/RestGraphGetEdge.generated
@@ -2,13 +2,13 @@ shell> curl --data-binary @- --dump - http://localhost:8529/_api/graph/graph/edg
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: 1214179675
+etag: 1212522797
 
 { 
   "edge" : { 
     "_id" : "edges/edge1", 
     "_key" : "edge1", 
-    "_rev" : "1214179675", 
+    "_rev" : "1212522797", 
     "_from" : "vertices/vert1", 
     "_to" : "vertices/vert2", 
     "$label" : null, 
diff --git a/Documentation/Examples/RestGraphGetEdges.generated b/Documentation/Examples/RestGraphGetEdges.generated
index 266b35ff6a..bdecc00a94 100644
--- a/Documentation/Examples/RestGraphGetEdges.generated
+++ b/Documentation/Examples/RestGraphGetEdges.generated
@@ -11,7 +11,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/edge2", 
       "_key" : "edge2", 
-      "_rev" : "1229384027", 
+      "_rev" : "1227727149", 
       "_from" : "vertices/v1", 
       "_to" : "vertices/v3", 
       "$label" : null, 
@@ -20,7 +20,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/edge3", 
       "_key" : "edge3", 
-      "_rev" : "1229908315", 
+      "_rev" : "1228251437", 
       "_from" : "vertices/v2", 
       "_to" : "vertices/v4", 
       "$label" : null, 
@@ -29,7 +29,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/edge1", 
       "_key" : "edge1", 
-      "_rev" : "1228859739", 
+      "_rev" : "1227202861", 
       "_from" : "vertices/v1", 
       "_to" : "vertices/v2", 
       "$label" : null, 
@@ -38,7 +38,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/edge4", 
       "_key" : "edge4", 
-      "_rev" : "1230432603", 
+      "_rev" : "1228775725", 
       "_from" : "vertices/v1", 
       "_to" : "vertices/v5", 
       "$label" : null, 
diff --git a/Documentation/Examples/RestGraphGetGraph.generated b/Documentation/Examples/RestGraphGetGraph.generated
index e5978b5d4d..d3692350dc 100644
--- a/Documentation/Examples/RestGraphGetGraph.generated
+++ b/Documentation/Examples/RestGraphGetGraph.generated
@@ -2,13 +2,13 @@ shell> curl --data-binary @- --dump - http://localhost:8529/_api/graph/graph
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: 1175775579
+etag: 1174708525
 
 { 
   "graph" : { 
     "_id" : "_graphs/graph", 
     "_key" : "graph", 
-    "_rev" : "1175775579", 
+    "_rev" : "1174708525", 
     "edgeDefinitions" : [ 
       { 
         "collection" : "edges", 
diff --git a/Documentation/Examples/RestGraphGetGraphs.generated b/Documentation/Examples/RestGraphGetGraphs.generated
index 54457345ec..bd61835a7c 100644
--- a/Documentation/Examples/RestGraphGetGraphs.generated
+++ b/Documentation/Examples/RestGraphGetGraphs.generated
@@ -8,7 +8,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "_graphs/graph2", 
       "_key" : "graph2", 
-      "_rev" : "1178462555", 
+      "_rev" : "1177395501", 
       "edgeDefinitions" : [ 
         { 
           "collection" : "edges2", 
@@ -24,7 +24,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "_graphs/graph1", 
       "_key" : "graph1", 
-      "_rev" : "1177479515", 
+      "_rev" : "1176412461", 
       "edgeDefinitions" : [ 
         { 
           "collection" : "edges1", 
diff --git a/Documentation/Examples/RestGraphGetVertex.generated b/Documentation/Examples/RestGraphGetVertex.generated
index 56647744a2..c96d03d8e1 100644
--- a/Documentation/Examples/RestGraphGetVertex.generated
+++ b/Documentation/Examples/RestGraphGetVertex.generated
@@ -2,13 +2,13 @@ shell> curl --data-binary @- --dump - http://localhost:8529/_api/graph/graph/ver
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
-etag: 1184688475
+etag: 1183621421
 
 { 
   "vertex" : { 
     "_id" : "vertices/v1", 
     "_key" : "v1", 
-    "_rev" : "1184688475", 
+    "_rev" : "1183621421", 
     "optional1" : "val1" 
   }, 
   "error" : false, 
diff --git a/Documentation/Examples/RestGraphGetVertexEdges.generated b/Documentation/Examples/RestGraphGetVertexEdges.generated
index ed2c1fd544..34703c5165 100644
--- a/Documentation/Examples/RestGraphGetVertexEdges.generated
+++ b/Documentation/Examples/RestGraphGetVertexEdges.generated
@@ -9,7 +9,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/edge1", 
       "_key" : "edge1", 
-      "_rev" : "1234757979", 
+      "_rev" : "1233101101", 
       "_from" : "vertices/v1", 
       "_to" : "vertices/v2", 
       "$label" : null, 
@@ -18,7 +18,7 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "edges/edge3", 
       "_key" : "edge3", 
-      "_rev" : "1235806555", 
+      "_rev" : "1234149677", 
       "_from" : "vertices/v2", 
       "_to" : "vertices/v4", 
       "$label" : null, 
diff --git a/Documentation/Examples/RestGraphGetVertexVertices.generated b/Documentation/Examples/RestGraphGetVertexVertices.generated
index c8fafe5a61..dc6ef0cc8e 100644
--- a/Documentation/Examples/RestGraphGetVertexVertices.generated
+++ b/Documentation/Examples/RestGraphGetVertexVertices.generated
@@ -9,13 +9,13 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "vertices/v1", 
       "_key" : "v1", 
-      "_rev" : "1198385499", 
+      "_rev" : "1196794157", 
       "optional1" : "val1" 
     }, 
     { 
       "_id" : "vertices/v4", 
       "_key" : "v4", 
-      "_rev" : "1199565147", 
+      "_rev" : "1197973805", 
       "optional1" : "val1" 
     } 
   ], 
diff --git a/Documentation/Examples/RestGraphGetVertexVertices2.generated b/Documentation/Examples/RestGraphGetVertexVertices2.generated
index ab6fa9acda..049721b3b2 100644
--- a/Documentation/Examples/RestGraphGetVertexVertices2.generated
+++ b/Documentation/Examples/RestGraphGetVertexVertices2.generated
@@ -9,13 +9,13 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "vertices/v4", 
       "_key" : "v4", 
-      "_rev" : "1205463387", 
+      "_rev" : "1203872045", 
       "optional1" : "val2" 
     }, 
     { 
       "_id" : "vertices/v1", 
       "_key" : "v1", 
-      "_rev" : "1204283739", 
+      "_rev" : "1202692397", 
       "optional1" : "val1" 
     } 
   ], 
diff --git a/Documentation/Examples/RestGraphGetVertices.generated b/Documentation/Examples/RestGraphGetVertices.generated
index bf3088d1ed..ed991e4033 100644
--- a/Documentation/Examples/RestGraphGetVertices.generated
+++ b/Documentation/Examples/RestGraphGetVertices.generated
@@ -11,31 +11,31 @@ content-type: application/json; charset=utf-8
     { 
       "_id" : "vertices/v3", 
       "_key" : "v3", 
-      "_rev" : "1195567451", 
+      "_rev" : "1193910573", 
       "optional1" : "val1" 
     }, 
     { 
       "_id" : "vertices/v2", 
       "_key" : "v2", 
-      "_rev" : "1195174235", 
+      "_rev" : "1193517357", 
       "optional1" : "val1" 
     }, 
     { 
       "_id" : "vertices/v5", 
       "_key" : "v5", 
-      "_rev" : "1196353883", 
+      "_rev" : "1194697005", 
       "optional1" : "val1" 
     }, 
     { 
       "_id" : "vertices/v4", 
       "_key" : "v4", 
-      "_rev" : "1195960667", 
+      "_rev" : "1194303789", 
       "optional1" : "val1" 
     }, 
     { 
       "_id" : "vertices/v1", 
       "_key" : "v1", 
-      "_rev" : "1194781019", 
+      "_rev" : "1193124141", 
       "optional1" : "val1" 
     } 
   ], 
diff --git a/Documentation/Examples/RestGraphPostGraph.generated b/Documentation/Examples/RestGraphPostGraph.generated
index daddca1cc1..6ab5bd29bb 100644
--- a/Documentation/Examples/RestGraphPostGraph.generated
+++ b/Documentation/Examples/RestGraphPostGraph.generated
@@ -7,13 +7,13 @@ shell> curl -X POST --data-binary @- --dump - http://localhost:8529/_api/graph/
 
 HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
-etag: 1174464859
+etag: 1173397805
 
 { 
   "graph" : { 
     "_id" : "_graphs/graph", 
     "_key" : "graph", 
-    "_rev" : "1174464859", 
+    "_rev" : "1173397805", 
     "edgeDefinitions" : [ 
       { 
         "collection" : "edges", 
diff --git a/Documentation/Examples/RestIndexAllIndexes.generated b/Documentation/Examples/RestIndexAllIndexes.generated
index 834670ef54..82bb8c56ff 100644
--- a/Documentation/Examples/RestIndexAllIndexes.generated
+++ b/Documentation/Examples/RestIndexAllIndexes.generated
@@ -16,7 +16,7 @@ content-type: application/json; charset=utf-8
       ] 
     }, 
     { 
-      "id" : "products/1237444955", 
+      "id" : "products/1235788077", 
       "type" : "hash", 
       "unique" : false, 
       "sparse" : false, 
@@ -26,7 +26,7 @@ content-type: application/json; charset=utf-8
       ] 
     }, 
     { 
-      "id" : "products/1237707099", 
+      "id" : "products/1236050221", 
       "type" : "skiplist", 
       "unique" : false, 
       "sparse" : true, 
@@ -46,8 +46,8 @@ content-type: application/json; charset=utf-8
         "_key" 
       ] 
     }, 
-    "products/1237444955" : { 
-      "id" : "products/1237444955", 
+    "products/1235788077" : { 
+      "id" : "products/1235788077", 
       "type" : "hash", 
       "unique" : false, 
       "sparse" : false, 
@@ -56,8 +56,8 @@ content-type: application/json; charset=utf-8
         "name" 
       ] 
     }, 
-    "products/1237707099" : { 
-      "id" : "products/1237707099", 
+    "products/1236050221" : { 
+      "id" : "products/1236050221", 
       "type" : "skiplist", 
       "unique" : false, 
       "sparse" : true, 
diff --git a/Documentation/Examples/RestIndexCreateGeoLatitudeLongitude.generated b/Documentation/Examples/RestIndexCreateGeoLatitudeLongitude.generated
index f6a243c109..7daddc1a66 100644
--- a/Documentation/Examples/RestIndexCreateGeoLatitudeLongitude.generated
+++ b/Documentation/Examples/RestIndexCreateGeoLatitudeLongitude.generated
@@ -11,7 +11,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1239542107", 
+  "id" : "products/1237885229", 
   "type" : "geo2", 
   "unique" : false, 
   "sparse" : true, 
diff --git a/Documentation/Examples/RestIndexCreateGeoLocation.generated b/Documentation/Examples/RestIndexCreateGeoLocation.generated
index 38a5722daa..da2317d8ec 100644
--- a/Documentation/Examples/RestIndexCreateGeoLocation.generated
+++ b/Documentation/Examples/RestIndexCreateGeoLocation.generated
@@ -10,7 +10,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1239017819", 
+  "id" : "products/1237295405", 
   "type" : "geo1", 
   "unique" : false, 
   "sparse" : true, 
diff --git a/Documentation/Examples/RestIndexCreateNewCapConstraint.generated b/Documentation/Examples/RestIndexCreateNewCapConstraint.generated
index 1c8a42f498..3a83660af5 100644
--- a/Documentation/Examples/RestIndexCreateNewCapConstraint.generated
+++ b/Documentation/Examples/RestIndexCreateNewCapConstraint.generated
@@ -5,7 +5,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1238427995", 
+  "id" : "products/1236771117", 
   "type" : "cap", 
   "unique" : false, 
   "size" : 10, 
diff --git a/Documentation/Examples/RestIndexCreateNewFulltext.generated b/Documentation/Examples/RestIndexCreateNewFulltext.generated
index 43613d1015..0de7e26ffb 100644
--- a/Documentation/Examples/RestIndexCreateNewFulltext.generated
+++ b/Documentation/Examples/RestIndexCreateNewFulltext.generated
@@ -10,7 +10,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1242491227", 
+  "id" : "products/1240834349", 
   "type" : "fulltext", 
   "unique" : false, 
   "sparse" : true, 
diff --git a/Documentation/Examples/RestIndexCreateNewHashIndex.generated b/Documentation/Examples/RestIndexCreateNewHashIndex.generated
index 38f3b4f2b6..a5f873926e 100644
--- a/Documentation/Examples/RestIndexCreateNewHashIndex.generated
+++ b/Documentation/Examples/RestIndexCreateNewHashIndex.generated
@@ -12,7 +12,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1240590683", 
+  "id" : "products/1238933805", 
   "type" : "hash", 
   "unique" : false, 
   "sparse" : false, 
diff --git a/Documentation/Examples/RestIndexCreateNewSkiplist.generated b/Documentation/Examples/RestIndexCreateNewSkiplist.generated
index 2915ca6d1f..a03f92d88b 100644
--- a/Documentation/Examples/RestIndexCreateNewSkiplist.generated
+++ b/Documentation/Examples/RestIndexCreateNewSkiplist.generated
@@ -12,7 +12,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1241573723", 
+  "id" : "products/1239916845", 
   "type" : "skiplist", 
   "unique" : false, 
   "sparse" : false, 
diff --git a/Documentation/Examples/RestIndexCreateNewUniqueConstraint.generated b/Documentation/Examples/RestIndexCreateNewUniqueConstraint.generated
index 2f6675bba9..b034452ba4 100644
--- a/Documentation/Examples/RestIndexCreateNewUniqueConstraint.generated
+++ b/Documentation/Examples/RestIndexCreateNewUniqueConstraint.generated
@@ -12,7 +12,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1240066395", 
+  "id" : "products/1238409517", 
   "type" : "hash", 
   "unique" : true, 
   "sparse" : false, 
diff --git a/Documentation/Examples/RestIndexCreateSparseHashIndex.generated b/Documentation/Examples/RestIndexCreateSparseHashIndex.generated
index ac46412438..97b5ad631c 100644
--- a/Documentation/Examples/RestIndexCreateSparseHashIndex.generated
+++ b/Documentation/Examples/RestIndexCreateSparseHashIndex.generated
@@ -12,7 +12,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1241049435", 
+  "id" : "products/1239392557", 
   "type" : "hash", 
   "unique" : false, 
   "sparse" : true, 
diff --git a/Documentation/Examples/RestIndexCreateSparseSkiplist.generated b/Documentation/Examples/RestIndexCreateSparseSkiplist.generated
index d560553ff6..abac0b4596 100644
--- a/Documentation/Examples/RestIndexCreateSparseSkiplist.generated
+++ b/Documentation/Examples/RestIndexCreateSparseSkiplist.generated
@@ -12,7 +12,7 @@ HTTP/1.1 201 Created
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1242032475", 
+  "id" : "products/1240375597", 
   "type" : "skiplist", 
   "unique" : false, 
   "sparse" : true, 
diff --git a/Documentation/Examples/RestIndexDeleteUniqueSkiplist.generated b/Documentation/Examples/RestIndexDeleteUniqueSkiplist.generated
index 3278a4ca78..9f6a77357b 100644
--- a/Documentation/Examples/RestIndexDeleteUniqueSkiplist.generated
+++ b/Documentation/Examples/RestIndexDeleteUniqueSkiplist.generated
@@ -1,10 +1,10 @@
-shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/index/products/1243015515
+shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/index/products/1241358637
 
 HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "products/1243015515", 
+  "id" : "products/1241358637", 
   "error" : false, 
   "code" : 200 
 }
diff --git a/Documentation/Examples/RestReplicationApplierStart.generated b/Documentation/Examples/RestReplicationApplierStart.generated
index a02a4024bf..5eef84f1ac 100644
--- a/Documentation/Examples/RestReplicationApplierStart.generated
+++ b/Documentation/Examples/RestReplicationApplierStart.generated
@@ -10,7 +10,7 @@ content-type: application/json; charset=utf-8
     "lastProcessedContinuousTick" : null, 
     "lastAvailableContinuousTick" : null, 
     "progress" : { 
-      "time" : "2015-02-18T22:12:55Z", 
+      "time" : "2015-02-19T11:12:06Z", 
       "message" : "applier created", 
       "failedConnects" : 0 
     }, 
@@ -21,11 +21,11 @@ content-type: application/json; charset=utf-8
     "lastError" : { 
       "errorNum" : 0 
     }, 
-    "time" : "2015-02-18T22:14:06Z" 
+    "time" : "2015-02-19T11:12:53Z" 
   }, 
   "server" : { 
-    "version" : "2.5.0-alpha5", 
-    "serverId" : "186987722306660" 
+    "version" : "2.5.0-alpha6", 
+    "serverId" : "3709623332762" 
   }, 
   "endpoint" : "tcp://127.0.0.1:8529", 
   "database" : "_system" 
diff --git a/Documentation/Examples/RestReplicationApplierStateNotRunning.generated b/Documentation/Examples/RestReplicationApplierStateNotRunning.generated
index cf295f5a78..302ac227c2 100644
--- a/Documentation/Examples/RestReplicationApplierStateNotRunning.generated
+++ b/Documentation/Examples/RestReplicationApplierStateNotRunning.generated
@@ -10,7 +10,7 @@ content-type: application/json; charset=utf-8
     "lastProcessedContinuousTick" : null, 
     "lastAvailableContinuousTick" : null, 
     "progress" : { 
-      "time" : "2015-02-18T22:14:06Z", 
+      "time" : "2015-02-19T11:12:53Z", 
       "message" : "applier shut down", 
       "failedConnects" : 1 
     }, 
@@ -19,15 +19,15 @@ content-type: application/json; charset=utf-8
     "totalEvents" : 0, 
     "totalOperationsExcluded" : 0, 
     "lastError" : { 
-      "time" : "2015-02-18T22:14:06Z", 
+      "time" : "2015-02-19T11:12:53Z", 
       "errorMessage" : "could not connect to master at tcp://127.0.0.1:8529: Could not connect to 'tcp://127.0.0.1:8529' 'connect() failed with #61 - Connection refused'", 
       "errorNum" : 1412 
     }, 
-    "time" : "2015-02-18T22:14:06Z" 
+    "time" : "2015-02-19T11:12:53Z" 
   }, 
   "server" : { 
-    "version" : "2.5.0-alpha5", 
-    "serverId" : "186987722306660" 
+    "version" : "2.5.0-alpha6", 
+    "serverId" : "3709623332762" 
   }, 
   "endpoint" : "tcp://127.0.0.1:8529", 
   "database" : "_system" 
diff --git a/Documentation/Examples/RestReplicationApplierStateRunning.generated b/Documentation/Examples/RestReplicationApplierStateRunning.generated
index 55426bfe5c..f7ed1220cd 100644
--- a/Documentation/Examples/RestReplicationApplierStateRunning.generated
+++ b/Documentation/Examples/RestReplicationApplierStateRunning.generated
@@ -10,7 +10,7 @@ content-type: application/json; charset=utf-8
     "lastProcessedContinuousTick" : null, 
     "lastAvailableContinuousTick" : null, 
     "progress" : { 
-      "time" : "2015-02-18T22:14:06Z", 
+      "time" : "2015-02-19T11:12:53Z", 
       "message" : "fetching master state information", 
       "failedConnects" : 1 
     }, 
@@ -21,11 +21,11 @@ content-type: application/json; charset=utf-8
     "lastError" : { 
       "errorNum" : 0 
     }, 
-    "time" : "2015-02-18T22:14:06Z" 
+    "time" : "2015-02-19T11:12:53Z" 
   }, 
   "server" : { 
-    "version" : "2.5.0-alpha5", 
-    "serverId" : "186987722306660" 
+    "version" : "2.5.0-alpha6", 
+    "serverId" : "3709623332762" 
   }, 
   "endpoint" : "tcp://127.0.0.1:8529", 
   "database" : "_system" 
diff --git a/Documentation/Examples/RestReplicationApplierStop.generated b/Documentation/Examples/RestReplicationApplierStop.generated
index 7d3ba80980..666f2a4b61 100644
--- a/Documentation/Examples/RestReplicationApplierStop.generated
+++ b/Documentation/Examples/RestReplicationApplierStop.generated
@@ -10,7 +10,7 @@ content-type: application/json; charset=utf-8
     "lastProcessedContinuousTick" : null, 
     "lastAvailableContinuousTick" : null, 
     "progress" : { 
-      "time" : "2015-02-18T22:14:06Z", 
+      "time" : "2015-02-19T11:12:53Z", 
       "message" : "applier shut down", 
       "failedConnects" : 1 
     }, 
@@ -19,15 +19,15 @@ content-type: application/json; charset=utf-8
     "totalEvents" : 0, 
     "totalOperationsExcluded" : 0, 
     "lastError" : { 
-      "time" : "2015-02-18T22:14:06Z", 
+      "time" : "2015-02-19T11:12:53Z", 
       "errorMessage" : "could not connect to master at tcp://127.0.0.1:8529: Could not connect to 'tcp://127.0.0.1:8529' 'connect() failed with #61 - Connection refused'", 
       "errorNum" : 1412 
     }, 
-    "time" : "2015-02-18T22:14:06Z" 
+    "time" : "2015-02-19T11:12:53Z" 
   }, 
   "server" : { 
-    "version" : "2.5.0-alpha5", 
-    "serverId" : "186987722306660" 
+    "version" : "2.5.0-alpha6", 
+    "serverId" : "3709623332762" 
   }, 
   "endpoint" : "tcp://127.0.0.1:8529", 
   "database" : "_system" 
diff --git a/Documentation/Examples/RestReplicationDump.generated b/Documentation/Examples/RestReplicationDump.generated
index e93b8651a3..a9dc99cc91 100644
--- a/Documentation/Examples/RestReplicationDump.generated
+++ b/Documentation/Examples/RestReplicationDump.generated
@@ -3,6 +3,6 @@ shell> curl --data-binary @- --dump - http://localhost:8529/_api/replication/dum
 HTTP/1.1 200 OK
 content-type: application/x-arango-dump; charset=utf-8
 x-arango-replication-checkmore: false
-x-arango-replication-lastincluded: 1549003099
+x-arango-replication-lastincluded: 1548198189
 
-"{\"tick\":\"1548347739\",\"type\":2300,\"key\":\"123456\",\"rev\":\"1548282203\",\"data\":{\"_key\":\"123456\",\"_rev\":\"1548282203\",\"c\":false,\"b\":1,\"d\":\"additional value\"}}\n{\"tick\":\"1548806491\",\"type\":2302,\"key\":\"foobar\",\"rev\":\"1548740955\"}\n{\"tick\":\"1549003099\",\"type\":2302,\"key\":\"abcdef\",\"rev\":\"1548937563\"}\n"
+"{\"tick\":\"1547542829\",\"type\":2300,\"key\":\"123456\",\"rev\":\"1547477293\",\"data\":{\"_key\":\"123456\",\"_rev\":\"1547477293\",\"c\":false,\"b\":1,\"d\":\"additional value\"}}\n{\"tick\":\"1548001581\",\"type\":2302,\"key\":\"foobar\",\"rev\":\"1547936045\"}\n{\"tick\":\"1548198189\",\"type\":2302,\"key\":\"abcdef\",\"rev\":\"1548132653\"}\n"
diff --git a/Documentation/Examples/RestReplicationInventory.generated b/Documentation/Examples/RestReplicationInventory.generated
index ab00849446..05b4c53564 100644
--- a/Documentation/Examples/RestReplicationInventory.generated
+++ b/Documentation/Examples/RestReplicationInventory.generated
@@ -9,7 +9,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "7203163", 
+        "cid" : "7184685", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -19,7 +19,7 @@ content-type: application/json; charset=utf-8
       }, 
       "indexes" : [ 
         { 
-          "id" : "7465307", 
+          "id" : "7446829", 
           "type" : "hash", 
           "unique" : true, 
           "sparse" : false, 
@@ -34,7 +34,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "4581723", 
+        "cid" : "4563245", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 4194304, 
@@ -48,7 +48,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "2222427", 
+        "cid" : "2203949", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -62,7 +62,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "2353499", 
+        "cid" : "2335021", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -76,7 +76,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "2484571", 
+        "cid" : "2466093", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 33554432, 
@@ -90,7 +90,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "16509275", 
+        "cid" : "16490797", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -104,7 +104,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "452955", 
+        "cid" : "434477", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -114,7 +114,7 @@ content-type: application/json; charset=utf-8
       }, 
       "indexes" : [ 
         { 
-          "id" : "715099", 
+          "id" : "696621", 
           "type" : "hash", 
           "unique" : true, 
           "sparse" : true, 
@@ -129,7 +129,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1092872539", 
+        "cid" : "1090625837", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -143,7 +143,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "760146267", 
+        "cid" : "757506349", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -157,7 +157,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1002367323", 
+        "cid" : "1000186157", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -171,7 +171,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1002105179", 
+        "cid" : "999924013", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -185,7 +185,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1091955035", 
+        "cid" : "1089708333", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -199,7 +199,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1002629467", 
+        "cid" : "1000448301", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -213,7 +213,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1503193435", 
+        "cid" : "1502519597", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -227,7 +227,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1403119963", 
+        "cid" : "1401200941", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -241,7 +241,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "806545755", 
+        "cid" : "803905837", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -251,7 +251,7 @@ content-type: application/json; charset=utf-8
       }, 
       "indexes" : [ 
         { 
-          "id" : "806807899", 
+          "id" : "804167981", 
           "type" : "geo1", 
           "unique" : false, 
           "sparse" : true, 
@@ -268,7 +268,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1402857819", 
+        "cid" : "1400938797", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -282,7 +282,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1002498395", 
+        "cid" : "1000317229", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -296,7 +296,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1503324507", 
+        "cid" : "1502650669", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -310,7 +310,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1439164763", 
+        "cid" : "1438490925", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -324,7 +324,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1176889691", 
+        "cid" : "1175822637", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -338,7 +338,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1178265947", 
+        "cid" : "1177198893", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -352,7 +352,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1403251035", 
+        "cid" : "1401332013", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -366,7 +366,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1002236251", 
+        "cid" : "1000055085", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -380,7 +380,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1402988891", 
+        "cid" : "1401069869", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -394,7 +394,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1002760539", 
+        "cid" : "1000579373", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -408,7 +408,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1403382107", 
+        "cid" : "1401463085", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -422,7 +422,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1503455579", 
+        "cid" : "1502781741", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -435,9 +435,9 @@ content-type: application/json; charset=utf-8
   ], 
   "state" : { 
     "running" : true, 
-    "lastLogTick" : "1544415579", 
-    "totalEvents" : 9503, 
-    "time" : "2015-02-18T22:14:02Z" 
+    "lastLogTick" : "1543807277", 
+    "totalEvents" : 9505, 
+    "time" : "2015-02-19T11:12:51Z" 
   }, 
-  "tick" : "1544481115" 
+  "tick" : "1543807277" 
 }
diff --git a/Documentation/Examples/RestReplicationInventoryIndexes.generated b/Documentation/Examples/RestReplicationInventoryIndexes.generated
index fcea202a21..b355dc405b 100644
--- a/Documentation/Examples/RestReplicationInventoryIndexes.generated
+++ b/Documentation/Examples/RestReplicationInventoryIndexes.generated
@@ -9,7 +9,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "7203163", 
+        "cid" : "7184685", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -19,7 +19,7 @@ content-type: application/json; charset=utf-8
       }, 
       "indexes" : [ 
         { 
-          "id" : "7465307", 
+          "id" : "7446829", 
           "type" : "hash", 
           "unique" : true, 
           "sparse" : false, 
@@ -34,7 +34,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "4581723", 
+        "cid" : "4563245", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 4194304, 
@@ -48,7 +48,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "2222427", 
+        "cid" : "2203949", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -62,7 +62,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "2353499", 
+        "cid" : "2335021", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -76,7 +76,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "2484571", 
+        "cid" : "2466093", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 33554432, 
@@ -90,7 +90,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "16509275", 
+        "cid" : "16490797", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -104,7 +104,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "452955", 
+        "cid" : "434477", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -114,7 +114,7 @@ content-type: application/json; charset=utf-8
       }, 
       "indexes" : [ 
         { 
-          "id" : "715099", 
+          "id" : "696621", 
           "type" : "hash", 
           "unique" : true, 
           "sparse" : true, 
@@ -129,7 +129,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1092872539", 
+        "cid" : "1090625837", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -143,7 +143,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "760146267", 
+        "cid" : "757506349", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -157,7 +157,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1002367323", 
+        "cid" : "1000186157", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -171,7 +171,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1002105179", 
+        "cid" : "999924013", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -185,7 +185,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1091955035", 
+        "cid" : "1089708333", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -199,7 +199,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1002629467", 
+        "cid" : "1000448301", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -213,7 +213,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1503193435", 
+        "cid" : "1502519597", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -227,7 +227,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1403119963", 
+        "cid" : "1401200941", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -241,7 +241,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "806545755", 
+        "cid" : "803905837", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -251,7 +251,7 @@ content-type: application/json; charset=utf-8
       }, 
       "indexes" : [ 
         { 
-          "id" : "806807899", 
+          "id" : "804167981", 
           "type" : "geo1", 
           "unique" : false, 
           "sparse" : true, 
@@ -268,7 +268,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1402857819", 
+        "cid" : "1400938797", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -282,7 +282,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1002498395", 
+        "cid" : "1000317229", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -296,7 +296,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1544546651", 
+        "cid" : "1543872813", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -306,7 +306,7 @@ content-type: application/json; charset=utf-8
       }, 
       "indexes" : [ 
         { 
-          "id" : "1544808795", 
+          "id" : "1544134957", 
           "type" : "hash", 
           "unique" : false, 
           "sparse" : false, 
@@ -316,7 +316,7 @@ content-type: application/json; charset=utf-8
           ] 
         }, 
         { 
-          "id" : "1545136475", 
+          "id" : "1544462637", 
           "type" : "skiplist", 
           "unique" : true, 
           "sparse" : false, 
@@ -326,7 +326,7 @@ content-type: application/json; charset=utf-8
           ] 
         }, 
         { 
-          "id" : "1545333083", 
+          "id" : "1544659245", 
           "type" : "cap", 
           "unique" : false, 
           "size" : 500, 
@@ -338,7 +338,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1545529691", 
+        "cid" : "1544855853", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -348,7 +348,7 @@ content-type: application/json; charset=utf-8
       }, 
       "indexes" : [ 
         { 
-          "id" : "1545791835", 
+          "id" : "1545117997", 
           "type" : "fulltext", 
           "unique" : false, 
           "sparse" : true, 
@@ -358,7 +358,7 @@ content-type: application/json; charset=utf-8
           ] 
         }, 
         { 
-          "id" : "1546053979", 
+          "id" : "1545380141", 
           "type" : "skiplist", 
           "unique" : false, 
           "sparse" : false, 
@@ -367,7 +367,7 @@ content-type: application/json; charset=utf-8
           ] 
         }, 
         { 
-          "id" : "1546250587", 
+          "id" : "1545576749", 
           "type" : "cap", 
           "unique" : false, 
           "size" : 0, 
@@ -379,7 +379,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1503324507", 
+        "cid" : "1502650669", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -393,7 +393,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1439164763", 
+        "cid" : "1438490925", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -407,7 +407,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 2, 
-        "cid" : "1176889691", 
+        "cid" : "1175822637", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -421,7 +421,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1178265947", 
+        "cid" : "1177198893", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -435,7 +435,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1403251035", 
+        "cid" : "1401332013", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -449,7 +449,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1002236251", 
+        "cid" : "1000055085", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -463,7 +463,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1402988891", 
+        "cid" : "1401069869", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -477,7 +477,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1002760539", 
+        "cid" : "1000579373", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -491,7 +491,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1403382107", 
+        "cid" : "1401463085", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -505,7 +505,7 @@ content-type: application/json; charset=utf-8
       "parameters" : { 
         "version" : 5, 
         "type" : 3, 
-        "cid" : "1503455579", 
+        "cid" : "1502781741", 
         "deleted" : false, 
         "doCompact" : true, 
         "maximalSize" : 1048576, 
@@ -518,9 +518,9 @@ content-type: application/json; charset=utf-8
   ], 
   "state" : { 
     "running" : true, 
-    "lastLogTick" : "1544612187", 
-    "totalEvents" : 9516, 
-    "time" : "2015-02-18T22:14:02Z" 
+    "lastLogTick" : "1543938349", 
+    "totalEvents" : 9518, 
+    "time" : "2015-02-19T11:12:51Z" 
   }, 
-  "tick" : "1546381659" 
+  "tick" : "1545707821" 
 }
diff --git a/Documentation/Examples/RestReplicationLoggerFollowBufferLimit.generated b/Documentation/Examples/RestReplicationLoggerFollowBufferLimit.generated
index 6aa79b33c5..03335cb089 100644
--- a/Documentation/Examples/RestReplicationLoggerFollowBufferLimit.generated
+++ b/Documentation/Examples/RestReplicationLoggerFollowBufferLimit.generated
@@ -1,10 +1,10 @@
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/replication/logger-follow?from=1542580571&chunkSize=400
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/replication/logger-follow?from=1541906733&chunkSize=400
 
 HTTP/1.1 200 OK
 content-type: application/x-arango-dump; charset=utf-8
 x-arango-replication-active: true
 x-arango-replication-checkmore: true
-x-arango-replication-lastincluded: 1543104859
-x-arango-replication-lasttick: 1544415579
+x-arango-replication-lastincluded: 1542496557
+x-arango-replication-lasttick: 1543807277
 
-"{\"tick\":\"1542777179\",\"type\":2000,\"database\":\"125275\",\"cid\":\"1542711643\",\"collection\":{\"version\":5,\"type\":2,\"cid\":\"1542711643\",\"deleted\":false,\"doCompact\":true,\"maximalSize\":1048576,\"name\":\"products\",\"isVolatile\":false,\"waitForSync\":false}}\n{\"tick\":\"1543104859\",\"type\":2300,\"database\":\"125275\",\"cid\":\"1542711643\",\"tid\":\"0\",\"key\":\"p1\",\"rev\":\"1543039323\",\"data\":{\"_key\":\"p1\",\"_rev\":\"1543039323\",\"name\":\"flux compensator\"}}\n"
+"{\"tick\":\"1542168877\",\"type\":2000,\"database\":\"106797\",\"cid\":\"1542103341\",\"collection\":{\"version\":5,\"type\":2,\"cid\":\"1542103341\",\"deleted\":false,\"doCompact\":true,\"maximalSize\":1048576,\"name\":\"products\",\"isVolatile\":false,\"waitForSync\":false}}\n{\"tick\":\"1542496557\",\"type\":2300,\"database\":\"106797\",\"cid\":\"1542103341\",\"tid\":\"0\",\"key\":\"p1\",\"rev\":\"1542431021\",\"data\":{\"_key\":\"p1\",\"_rev\":\"1542431021\",\"name\":\"flux compensator\"}}\n"
diff --git a/Documentation/Examples/RestReplicationLoggerFollowEmpty.generated b/Documentation/Examples/RestReplicationLoggerFollowEmpty.generated
index e2d27ab6c0..c848e56608 100644
--- a/Documentation/Examples/RestReplicationLoggerFollowEmpty.generated
+++ b/Documentation/Examples/RestReplicationLoggerFollowEmpty.generated
@@ -1,9 +1,9 @@
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/replication/logger-follow?from=1539434843
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/replication/logger-follow?from=1540661549
 
 HTTP/1.1 204 No Content
 content-type: application/x-arango-dump; charset=utf-8
 x-arango-replication-active: true
 x-arango-replication-checkmore: false
 x-arango-replication-lastincluded: 0
-x-arango-replication-lasttick: 1539434843
+x-arango-replication-lasttick: 1540661549
 
diff --git a/Documentation/Examples/RestReplicationLoggerFollowSome.generated b/Documentation/Examples/RestReplicationLoggerFollowSome.generated
index 761a6c6d0c..444b76f121 100644
--- a/Documentation/Examples/RestReplicationLoggerFollowSome.generated
+++ b/Documentation/Examples/RestReplicationLoggerFollowSome.generated
@@ -1,10 +1,10 @@
-shell> curl --data-binary @- --dump - http://localhost:8529/_api/replication/logger-follow?from=1541138779
+shell> curl --data-binary @- --dump - http://localhost:8529/_api/replication/logger-follow?from=1540661549
 
 HTTP/1.1 200 OK
 content-type: application/x-arango-dump; charset=utf-8
 x-arango-replication-active: true
 x-arango-replication-checkmore: false
-x-arango-replication-lastincluded: 1542580571
-x-arango-replication-lasttick: 1542580571
+x-arango-replication-lastincluded: 1541906733
+x-arango-replication-lasttick: 1541906733
 
-"{\"tick\":\"1541269851\",\"type\":2000,\"database\":\"125275\",\"cid\":\"1541204315\",\"collection\":{\"version\":5,\"type\":2,\"cid\":\"1541204315\",\"deleted\":false,\"doCompact\":true,\"maximalSize\":1048576,\"name\":\"products\",\"isVolatile\":false,\"waitForSync\":false}}\n{\"tick\":\"1541335387\",\"type\":2001,\"database\":\"125275\",\"cid\":\"1541204315\"}\n{\"tick\":\"1541466459\",\"type\":2000,\"database\":\"125275\",\"cid\":\"1541400923\",\"collection\":{\"version\":5,\"type\":2,\"cid\":\"1541400923\",\"deleted\":false,\"doCompact\":true,\"maximalSize\":1048576,\"name\":\"products\",\"isVolatile\":false,\"waitForSync\":false}}\n{\"tick\":\"1541794139\",\"type\":2300,\"database\":\"125275\",\"cid\":\"1541400923\",\"tid\":\"0\",\"key\":\"p1\",\"rev\":\"1541728603\",\"data\":{\"_key\":\"p1\",\"_rev\":\"1541728603\",\"name\":\"flux compensator\"}}\n{\"tick\":\"1542121819\",\"type\":2300,\"database\":\"125275\",\"cid\":\"1541400923\",\"tid\":\"0\",\"key\":\"p2\",\"rev\":\"1542056283\",\"data\":{\"_key\":\"p2\",\"_rev\":\"1542056283\",\"hp\":5100,\"name\":\"hybrid hovercraft\"}}\n{\"tick\":\"1542318427\",\"type\":2302,\"database\":\"125275\",\"cid\":\"1541400923\",\"tid\":\"0\",\"key\":\"p1\",\"rev\":\"1542252891\"}\n{\"tick\":\"1542515035\",\"type\":2300,\"database\":\"125275\",\"cid\":\"1541400923\",\"tid\":\"0\",\"key\":\"p2\",\"rev\":\"1542449499\",\"data\":{\"_key\":\"p2\",\"_rev\":\"1542449499\"}}\n{\"tick\":\"1542580571\",\"type\":2001,\"database\":\"125275\",\"cid\":\"1541400923\"}\n"
+"{\"tick\":\"1540792621\",\"type\":2000,\"database\":\"106797\",\"cid\":\"1540727085\",\"collection\":{\"version\":5,\"type\":2,\"cid\":\"1540727085\",\"deleted\":false,\"doCompact\":true,\"maximalSize\":1048576,\"name\":\"products\",\"isVolatile\":false,\"waitForSync\":false}}\n{\"tick\":\"1541120301\",\"type\":2300,\"database\":\"106797\",\"cid\":\"1540727085\",\"tid\":\"0\",\"key\":\"p1\",\"rev\":\"1541054765\",\"data\":{\"_key\":\"p1\",\"_rev\":\"1541054765\",\"name\":\"flux compensator\"}}\n{\"tick\":\"1541447981\",\"type\":2300,\"database\":\"106797\",\"cid\":\"1540727085\",\"tid\":\"0\",\"key\":\"p2\",\"rev\":\"1541382445\",\"data\":{\"_key\":\"p2\",\"_rev\":\"1541382445\",\"hp\":5100,\"name\":\"hybrid hovercraft\"}}\n{\"tick\":\"1541644589\",\"type\":2302,\"database\":\"106797\",\"cid\":\"1540727085\",\"tid\":\"0\",\"key\":\"p1\",\"rev\":\"1541579053\"}\n{\"tick\":\"1541841197\",\"type\":2300,\"database\":\"106797\",\"cid\":\"1540727085\",\"tid\":\"0\",\"key\":\"p2\",\"rev\":\"1541775661\",\"data\":{\"_key\":\"p2\",\"_rev\":\"1541775661\"}}\n{\"tick\":\"1541906733\",\"type\":2001,\"database\":\"106797\",\"cid\":\"1540727085\"}\n"
diff --git a/Documentation/Examples/RestReplicationLoggerStateActive.generated b/Documentation/Examples/RestReplicationLoggerStateActive.generated
index 88e734fafe..06b104289e 100644
--- a/Documentation/Examples/RestReplicationLoggerStateActive.generated
+++ b/Documentation/Examples/RestReplicationLoggerStateActive.generated
@@ -6,13 +6,13 @@ content-type: application/json; charset=utf-8
 { 
   "state" : { 
     "running" : true, 
-    "lastLogTick" : "1539434843", 
-    "totalEvents" : 9481, 
-    "time" : "2015-02-18T22:13:59Z" 
+    "lastLogTick" : "1540596013", 
+    "totalEvents" : 9483, 
+    "time" : "2015-02-19T11:12:48Z" 
   }, 
   "server" : { 
-    "version" : "2.5.0-alpha5", 
-    "serverId" : "186987722306660" 
+    "version" : "2.5.0-alpha6", 
+    "serverId" : "3709623332762" 
   }, 
   "clients" : [ ] 
 }
diff --git a/Documentation/Examples/RestReplicationServerId.generated b/Documentation/Examples/RestReplicationServerId.generated
index d7b94f73c4..079ec9adeb 100644
--- a/Documentation/Examples/RestReplicationServerId.generated
+++ b/Documentation/Examples/RestReplicationServerId.generated
@@ -4,5 +4,5 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "serverId" : "186987722306660" 
+  "serverId" : "3709623332762" 
 }
diff --git a/Documentation/Examples/RestSimpleAllBatch.generated b/Documentation/Examples/RestSimpleAllBatch.generated
index 291f46ba50..0858b26644 100644
--- a/Documentation/Examples/RestSimpleAllBatch.generated
+++ b/Documentation/Examples/RestSimpleAllBatch.generated
@@ -7,26 +7,26 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1245636955", 
-      "_key" : "1245636955", 
-      "_rev" : "1245636955", 
-      "Hello1" : "World1" 
+      "_id" : "products/1244635437", 
+      "_key" : "1244635437", 
+      "_rev" : "1244635437", 
+      "Hello3" : "World3" 
     }, 
     { 
-      "_id" : "products/1246947675", 
-      "_key" : "1246947675", 
-      "_rev" : "1246947675", 
-      "Hello5" : "World5" 
-    }, 
-    { 
-      "_id" : "products/1245964635", 
-      "_key" : "1245964635", 
-      "_rev" : "1245964635", 
+      "_id" : "products/1244307757", 
+      "_key" : "1244307757", 
+      "_rev" : "1244307757", 
       "Hello2" : "World2" 
+    }, 
+    { 
+      "_id" : "products/1244963117", 
+      "_key" : "1244963117", 
+      "_rev" : "1244963117", 
+      "Hello4" : "World4" 
     } 
   ], 
   "hasMore" : true, 
-  "id" : "1247144283", 
+  "id" : "1245487405", 
   "count" : 5, 
   "error" : false, 
   "code" : 201 
diff --git a/Documentation/Examples/RestSimpleAllSkipLimit.generated b/Documentation/Examples/RestSimpleAllSkipLimit.generated
index 923404f3e7..a3cb492e44 100644
--- a/Documentation/Examples/RestSimpleAllSkipLimit.generated
+++ b/Documentation/Examples/RestSimpleAllSkipLimit.generated
@@ -7,16 +7,16 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1244981595", 
-      "_key" : "1244981595", 
-      "_rev" : "1244981595", 
+      "_id" : "products/1243324717", 
+      "_key" : "1243324717", 
+      "_rev" : "1243324717", 
       "Hello5" : "World5" 
     }, 
     { 
-      "_id" : "products/1243998555", 
-      "_key" : "1243998555", 
-      "_rev" : "1243998555", 
-      "Hello2" : "World2" 
+      "_id" : "products/1242669357", 
+      "_key" : "1242669357", 
+      "_rev" : "1242669357", 
+      "Hello3" : "World3" 
     } 
   ], 
   "hasMore" : false, 
diff --git a/Documentation/Examples/RestSimpleAny.generated b/Documentation/Examples/RestSimpleAny.generated
index 20de885ef0..57be00250e 100644
--- a/Documentation/Examples/RestSimpleAny.generated
+++ b/Documentation/Examples/RestSimpleAny.generated
@@ -6,9 +6,9 @@ content-type: application/json; charset=utf-8
 
 { 
   "document" : { 
-    "_id" : "products/1248586075", 
-    "_key" : "1248586075", 
-    "_rev" : "1248586075", 
+    "_id" : "products/1246929197", 
+    "_key" : "1246929197", 
+    "_rev" : "1246929197", 
     "Hello4" : "World4" 
   }, 
   "error" : false, 
diff --git a/Documentation/Examples/RestSimpleByExample.generated b/Documentation/Examples/RestSimpleByExample.generated
index 0b7760721f..022d43821c 100644
--- a/Documentation/Examples/RestSimpleByExample.generated
+++ b/Documentation/Examples/RestSimpleByExample.generated
@@ -7,9 +7,28 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1267001691", 
-      "_key" : "1267001691", 
-      "_rev" : "1267001691", 
+      "_id" : "products/1264558381", 
+      "_key" : "1264558381", 
+      "_rev" : "1264558381", 
+      "i" : 1, 
+      "a" : { 
+        "k" : 1, 
+        "j" : 1 
+      } 
+    }, 
+    { 
+      "_id" : "products/1264886061", 
+      "_key" : "1264886061", 
+      "_rev" : "1264886061", 
+      "i" : 1, 
+      "a" : { 
+        "j" : 1 
+      } 
+    }, 
+    { 
+      "_id" : "products/1265344813", 
+      "_key" : "1265344813", 
+      "_rev" : "1265344813", 
       "i" : 1, 
       "a" : { 
         "k" : 2, 
@@ -17,29 +36,10 @@ content-type: application/json; charset=utf-8
       } 
     }, 
     { 
-      "_id" : "products/1266805083", 
-      "_key" : "1266805083", 
-      "_rev" : "1266805083", 
+      "_id" : "products/1265148205", 
+      "_key" : "1265148205", 
+      "_rev" : "1265148205", 
       "i" : 1 
-    }, 
-    { 
-      "_id" : "products/1266542939", 
-      "_key" : "1266542939", 
-      "_rev" : "1266542939", 
-      "i" : 1, 
-      "a" : { 
-        "j" : 1 
-      } 
-    }, 
-    { 
-      "_id" : "products/1266215259", 
-      "_key" : "1266215259", 
-      "_rev" : "1266215259", 
-      "i" : 1, 
-      "a" : { 
-        "k" : 1, 
-        "j" : 1 
-      } 
     } 
   ], 
   "hasMore" : false, 
diff --git a/Documentation/Examples/RestSimpleByExample2.generated b/Documentation/Examples/RestSimpleByExample2.generated
index acaad55a79..fbfbc15f06 100644
--- a/Documentation/Examples/RestSimpleByExample2.generated
+++ b/Documentation/Examples/RestSimpleByExample2.generated
@@ -7,21 +7,21 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1268509019", 
-      "_key" : "1268509019", 
-      "_rev" : "1268509019", 
+      "_id" : "products/1266524461", 
+      "_key" : "1266524461", 
+      "_rev" : "1266524461", 
       "i" : 1, 
       "a" : { 
+        "k" : 1, 
         "j" : 1 
       } 
     }, 
     { 
-      "_id" : "products/1268181339", 
-      "_key" : "1268181339", 
-      "_rev" : "1268181339", 
+      "_id" : "products/1266852141", 
+      "_key" : "1266852141", 
+      "_rev" : "1266852141", 
       "i" : 1, 
       "a" : { 
-        "k" : 1, 
         "j" : 1 
       } 
     } 
diff --git a/Documentation/Examples/RestSimpleByExample3.generated b/Documentation/Examples/RestSimpleByExample3.generated
index 0f6593439e..408cf8ece1 100644
--- a/Documentation/Examples/RestSimpleByExample3.generated
+++ b/Documentation/Examples/RestSimpleByExample3.generated
@@ -7,9 +7,9 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1270475099", 
-      "_key" : "1270475099", 
-      "_rev" : "1270475099", 
+      "_id" : "products/1268818221", 
+      "_key" : "1268818221", 
+      "_rev" : "1268818221", 
       "i" : 1, 
       "a" : { 
         "j" : 1 
diff --git a/Documentation/Examples/RestSimpleFirst.generated b/Documentation/Examples/RestSimpleFirst.generated
index 16bff7c69f..4d59bc7b05 100644
--- a/Documentation/Examples/RestSimpleFirst.generated
+++ b/Documentation/Examples/RestSimpleFirst.generated
@@ -7,9 +7,9 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1275914587", 
-      "_key" : "1275914587", 
-      "_rev" : "1275914587", 
+      "_id" : "products/1274257709", 
+      "_key" : "1274257709", 
+      "_rev" : "1274257709", 
       "i" : 1, 
       "a" : { 
         "k" : 1, 
@@ -17,9 +17,9 @@ content-type: application/json; charset=utf-8
       } 
     }, 
     { 
-      "_id" : "products/1276242267", 
-      "_key" : "1276242267", 
-      "_rev" : "1276242267", 
+      "_id" : "products/1274585389", 
+      "_key" : "1274585389", 
+      "_rev" : "1274585389", 
       "i" : 1, 
       "a" : { 
         "j" : 1 
diff --git a/Documentation/Examples/RestSimpleFirstExample.generated b/Documentation/Examples/RestSimpleFirstExample.generated
index 339a6f422e..64611b1049 100644
--- a/Documentation/Examples/RestSimpleFirstExample.generated
+++ b/Documentation/Examples/RestSimpleFirstExample.generated
@@ -6,10 +6,14 @@ content-type: application/json; charset=utf-8
 
 { 
   "document" : { 
-    "_id" : "products/1272703323", 
-    "_key" : "1272703323", 
-    "_rev" : "1272703323", 
-    "i" : 1 
+    "_id" : "products/1271243053", 
+    "_key" : "1271243053", 
+    "_rev" : "1271243053", 
+    "i" : 1, 
+    "a" : { 
+      "k" : 2, 
+      "j" : 2 
+    } 
   }, 
   "error" : false, 
   "code" : 200 
diff --git a/Documentation/Examples/RestSimpleFirstSingle.generated b/Documentation/Examples/RestSimpleFirstSingle.generated
index b4fbcbd5c1..b4ce8b0827 100644
--- a/Documentation/Examples/RestSimpleFirstSingle.generated
+++ b/Documentation/Examples/RestSimpleFirstSingle.generated
@@ -6,9 +6,9 @@ content-type: application/json; charset=utf-8
 
 { 
   "result" : { 
-    "_id" : "products/1277552987", 
-    "_key" : "1277552987", 
-    "_rev" : "1277552987", 
+    "_id" : "products/1275896109", 
+    "_key" : "1275896109", 
+    "_rev" : "1275896109", 
     "i" : 1, 
     "a" : { 
       "k" : 1, 
diff --git a/Documentation/Examples/RestSimpleFulltext.generated b/Documentation/Examples/RestSimpleFulltext.generated
index 86d4b33af4..ed3fcd9ca4 100644
--- a/Documentation/Examples/RestSimpleFulltext.generated
+++ b/Documentation/Examples/RestSimpleFulltext.generated
@@ -7,15 +7,15 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1264839003", 
-      "_key" : "1264839003", 
-      "_rev" : "1264839003", 
+      "_id" : "products/1263182125", 
+      "_key" : "1263182125", 
+      "_rev" : "1263182125", 
       "text" : "this text also has a word" 
     }, 
     { 
-      "_id" : "products/1264642395", 
-      "_key" : "1264642395", 
-      "_rev" : "1264642395", 
+      "_id" : "products/1262985517", 
+      "_key" : "1262985517", 
+      "_rev" : "1262985517", 
       "text" : "this text contains word" 
     } 
   ], 
diff --git a/Documentation/Examples/RestSimpleLast.generated b/Documentation/Examples/RestSimpleLast.generated
index bbdde6f51f..25e5ceb5d6 100644
--- a/Documentation/Examples/RestSimpleLast.generated
+++ b/Documentation/Examples/RestSimpleLast.generated
@@ -7,9 +7,9 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1279977819", 
-      "_key" : "1279977819", 
-      "_rev" : "1279977819", 
+      "_id" : "products/1278320941", 
+      "_key" : "1278320941", 
+      "_rev" : "1278320941", 
       "i" : 1, 
       "a" : { 
         "k" : 2, 
@@ -17,9 +17,9 @@ content-type: application/json; charset=utf-8
       } 
     }, 
     { 
-      "_id" : "products/1279781211", 
-      "_key" : "1279781211", 
-      "_rev" : "1279781211", 
+      "_id" : "products/1278124333", 
+      "_key" : "1278124333", 
+      "_rev" : "1278124333", 
       "i" : 1 
     } 
   ], 
diff --git a/Documentation/Examples/RestSimpleLastSingle.generated b/Documentation/Examples/RestSimpleLastSingle.generated
index 51cfb0268a..91d59f2a4b 100644
--- a/Documentation/Examples/RestSimpleLastSingle.generated
+++ b/Documentation/Examples/RestSimpleLastSingle.generated
@@ -6,9 +6,9 @@ content-type: application/json; charset=utf-8
 
 { 
   "result" : { 
-    "_id" : "products/1281616219", 
-    "_key" : "1281616219", 
-    "_rev" : "1281616219", 
+    "_id" : "products/1279959341", 
+    "_key" : "1279959341", 
+    "_rev" : "1279959341", 
     "i" : 1, 
     "a" : { 
       "k" : 2, 
diff --git a/Documentation/Examples/RestSimpleNear.generated b/Documentation/Examples/RestSimpleNear.generated
index 7123af348b..2633d28777 100644
--- a/Documentation/Examples/RestSimpleNear.generated
+++ b/Documentation/Examples/RestSimpleNear.generated
@@ -7,9 +7,9 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1251010907", 
-      "_key" : "1251010907", 
-      "_rev" : "1251010907", 
+      "_id" : "products/1249354029", 
+      "_key" : "1249354029", 
+      "_rev" : "1249354029", 
       "name" : "Name/0.002/", 
       "loc" : [ 
         0.002, 
@@ -17,9 +17,9 @@ content-type: application/json; charset=utf-8
       ] 
     }, 
     { 
-      "_id" : "products/1250617691", 
-      "_key" : "1250617691", 
-      "_rev" : "1250617691", 
+      "_id" : "products/1248960813", 
+      "_key" : "1248960813", 
+      "_rev" : "1248960813", 
       "name" : "Name/-0.002/", 
       "loc" : [ 
         -0.002, 
diff --git a/Documentation/Examples/RestSimpleNearDistance.generated b/Documentation/Examples/RestSimpleNearDistance.generated
index 3f30d2fbd3..af05a351cf 100644
--- a/Documentation/Examples/RestSimpleNearDistance.generated
+++ b/Documentation/Examples/RestSimpleNearDistance.generated
@@ -7,9 +7,9 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1253632347", 
-      "_key" : "1253632347", 
-      "_rev" : "1253632347", 
+      "_id" : "products/1251975469", 
+      "_key" : "1251975469", 
+      "_rev" : "1251975469", 
       "name" : "Name/-0.002/", 
       "loc" : [ 
         -0.002, 
@@ -18,9 +18,9 @@ content-type: application/json; charset=utf-8
       "distance" : 222.38985328911744 
     }, 
     { 
-      "_id" : "products/1254025563", 
-      "_key" : "1254025563", 
-      "_rev" : "1254025563", 
+      "_id" : "products/1252368685", 
+      "_key" : "1252368685", 
+      "_rev" : "1252368685", 
       "name" : "Name/0.002/", 
       "loc" : [ 
         0.002, 
@@ -29,9 +29,9 @@ content-type: application/json; charset=utf-8
       "distance" : 222.38985328911744 
     }, 
     { 
-      "_id" : "products/1253435739", 
-      "_key" : "1253435739", 
-      "_rev" : "1253435739", 
+      "_id" : "products/1251778861", 
+      "_key" : "1251778861", 
+      "_rev" : "1251778861", 
       "name" : "Name/-0.004/", 
       "loc" : [ 
         -0.004, 
diff --git a/Documentation/Examples/RestSimpleRange.generated b/Documentation/Examples/RestSimpleRange.generated
index e6fcd3abc6..08db91ffb8 100644
--- a/Documentation/Examples/RestSimpleRange.generated
+++ b/Documentation/Examples/RestSimpleRange.generated
@@ -7,15 +7,15 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1282599259", 
-      "_key" : "1282599259", 
-      "_rev" : "1282599259", 
+      "_id" : "products/1280942381", 
+      "_key" : "1280942381", 
+      "_rev" : "1280942381", 
       "i" : 2 
     }, 
     { 
-      "_id" : "products/1282795867", 
-      "_key" : "1282795867", 
-      "_rev" : "1282795867", 
+      "_id" : "products/1281138989", 
+      "_key" : "1281138989", 
+      "_rev" : "1281138989", 
       "i" : 3 
     } 
   ], 
diff --git a/Documentation/Examples/RestSimpleWithin.generated b/Documentation/Examples/RestSimpleWithin.generated
index 07c25c511e..8aaedbdb4e 100644
--- a/Documentation/Examples/RestSimpleWithin.generated
+++ b/Documentation/Examples/RestSimpleWithin.generated
@@ -7,9 +7,9 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1257040219", 
-      "_key" : "1257040219", 
-      "_rev" : "1257040219", 
+      "_id" : "products/1255383341", 
+      "_key" : "1255383341", 
+      "_rev" : "1255383341", 
       "name" : "Name/0.002/", 
       "loc" : [ 
         0.002, 
@@ -17,9 +17,9 @@ content-type: application/json; charset=utf-8
       ] 
     }, 
     { 
-      "_id" : "products/1256647003", 
-      "_key" : "1256647003", 
-      "_rev" : "1256647003", 
+      "_id" : "products/1254990125", 
+      "_key" : "1254990125", 
+      "_rev" : "1254990125", 
       "name" : "Name/-0.002/", 
       "loc" : [ 
         -0.002, 
diff --git a/Documentation/Examples/RestSimpleWithinDistance.generated b/Documentation/Examples/RestSimpleWithinDistance.generated
index 303ff42d9b..bdb697e004 100644
--- a/Documentation/Examples/RestSimpleWithinDistance.generated
+++ b/Documentation/Examples/RestSimpleWithinDistance.generated
@@ -7,9 +7,9 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1259661659", 
-      "_key" : "1259661659", 
-      "_rev" : "1259661659", 
+      "_id" : "products/1258004781", 
+      "_key" : "1258004781", 
+      "_rev" : "1258004781", 
       "name" : "Name/-0.002/", 
       "loc" : [ 
         -0.002, 
@@ -18,9 +18,9 @@ content-type: application/json; charset=utf-8
       "distance" : 222.38985328911744 
     }, 
     { 
-      "_id" : "products/1260054875", 
-      "_key" : "1260054875", 
-      "_rev" : "1260054875", 
+      "_id" : "products/1258397997", 
+      "_key" : "1258397997", 
+      "_rev" : "1258397997", 
       "name" : "Name/0.002/", 
       "loc" : [ 
         0.002, 
@@ -29,9 +29,9 @@ content-type: application/json; charset=utf-8
       "distance" : 222.38985328911744 
     }, 
     { 
-      "_id" : "products/1259465051", 
-      "_key" : "1259465051", 
-      "_rev" : "1259465051", 
+      "_id" : "products/1257808173", 
+      "_key" : "1257808173", 
+      "_rev" : "1257808173", 
       "name" : "Name/-0.004/", 
       "loc" : [ 
         -0.004, 
diff --git a/Documentation/Examples/RestSimpleWithinRectangle.generated b/Documentation/Examples/RestSimpleWithinRectangle.generated
index 068b5eb634..b0594f0c85 100644
--- a/Documentation/Examples/RestSimpleWithinRectangle.generated
+++ b/Documentation/Examples/RestSimpleWithinRectangle.generated
@@ -7,9 +7,9 @@ content-type: application/json; charset=utf-8
 { 
   "result" : [ 
     { 
-      "_id" : "products/1263659355", 
-      "_key" : "1263659355", 
-      "_rev" : "1263659355", 
+      "_id" : "products/1262002477", 
+      "_key" : "1262002477", 
+      "_rev" : "1262002477", 
       "name" : "Name/0.008/", 
       "loc" : [ 
         0.008, 
@@ -17,9 +17,9 @@ content-type: application/json; charset=utf-8
       ] 
     }, 
     { 
-      "_id" : "products/1263462747", 
-      "_key" : "1263462747", 
-      "_rev" : "1263462747", 
+      "_id" : "products/1261805869", 
+      "_key" : "1261805869", 
+      "_rev" : "1261805869", 
       "name" : "Name/0.006/", 
       "loc" : [ 
         0.006, 
diff --git a/Documentation/Examples/RestTasksCreate.generated b/Documentation/Examples/RestTasksCreate.generated
index 554317b86e..3f65ed04f0 100644
--- a/Documentation/Examples/RestTasksCreate.generated
+++ b/Documentation/Examples/RestTasksCreate.generated
@@ -5,15 +5,15 @@ HTTP/1.1 200 OK
 content-type: application/json; charset=utf-8
 
 { 
-  "id" : "1297017179", 
+  "id" : "1295294765", 
   "name" : "SampleTask", 
   "type" : "periodic", 
   "period" : 2, 
-  "created" : 1424297624.139638, 
+  "created" : 1424344357.940319, 
   "command" : "(function(params) { require('internal').print(params); })(params)", 
   "database" : "_system", 
   "error" : false, 
   "code" : 200 
 }
-shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/tasks/1297017179
+shell> curl -X DELETE --data-binary @- --dump - http://localhost:8529/_api/tasks/1295294765
 
diff --git a/Documentation/Examples/RestTasksListAll.generated b/Documentation/Examples/RestTasksListAll.generated
index 7426eeb7e0..3d2234a693 100644
--- a/Documentation/Examples/RestTasksListAll.generated
+++ b/Documentation/Examples/RestTasksListAll.generated
@@ -5,12 +5,12 @@ content-type: application/json; charset=utf-8
 
 [ 
   { 
-    "id" : "statistics-average-collector", 
-    "name" : "statistics-average-collector", 
+    "id" : "18194733", 
+    "name" : "user-defined task", 
     "type" : "periodic", 
-    "period" : 900, 
-    "created" : 1424297577.25107, 
-    "command" : "require('org/arangodb/statistics').historianAverage();", 
+    "period" : 1, 
+    "created" : 1424344328.231733, 
+    "command" : "(function () {\n      require('org/arangodb/foxx/queues/manager').manage();\n    })(params)", 
     "database" : "_system" 
   }, 
   { 
@@ -18,26 +18,26 @@ content-type: application/json; charset=utf-8
     "name" : "statistics-collector", 
     "type" : "periodic", 
     "period" : 10, 
-    "created" : 1424297577.250945, 
+    "created" : 1424344328.064447, 
     "command" : "require('org/arangodb/statistics').historian();", 
     "database" : "_system" 
   }, 
+  { 
+    "id" : "statistics-average-collector", 
+    "name" : "statistics-average-collector", 
+    "type" : "periodic", 
+    "period" : 900, 
+    "created" : 1424344328.064513, 
+    "command" : "require('org/arangodb/statistics').historianAverage();", 
+    "database" : "_system" 
+  }, 
   { 
     "id" : "statistics-gc", 
     "name" : "statistics-gc", 
     "type" : "periodic", 
     "period" : 450, 
-    "created" : 1424297577.251925, 
+    "created" : 1424344328.06494, 
     "command" : "require('org/arangodb/statistics').garbageCollector();", 
     "database" : "_system" 
-  }, 
-  { 
-    "id" : "18213211", 
-    "name" : "user-defined task", 
-    "type" : "periodic", 
-    "period" : 1, 
-    "created" : 1424297577.36106, 
-    "command" : "(function () {\n      require('org/arangodb/foxx/queues/manager').manage();\n    })(params)", 
-    "database" : "_system" 
   } 
 ]
diff --git a/Documentation/Examples/RestTasksListOne.generated b/Documentation/Examples/RestTasksListOne.generated
index 216dd5745f..94b5cf877a 100644
--- a/Documentation/Examples/RestTasksListOne.generated
+++ b/Documentation/Examples/RestTasksListOne.generated
@@ -8,7 +8,7 @@ content-type: application/json; charset=utf-8
   "name" : "statistics-average-collector", 
   "type" : "periodic", 
   "period" : 900, 
-  "created" : 1424297577.25107, 
+  "created" : 1424344328.064513, 
   "command" : "require('org/arangodb/statistics').historianAverage();", 
   "database" : "_system", 
   "error" : false, 
diff --git a/Documentation/Examples/RestTasksPutWithId.generated b/Documentation/Examples/RestTasksPutWithId.generated
index 3832927521..a7bb63618f 100644
--- a/Documentation/Examples/RestTasksPutWithId.generated
+++ b/Documentation/Examples/RestTasksPutWithId.generated
@@ -9,7 +9,7 @@ content-type: application/json; charset=utf-8
   "name" : "SampleTask", 
   "type" : "periodic", 
   "period" : 2, 
-  "created" : 1424297624.154611, 
+  "created" : 1424344357.953571, 
   "command" : "(function(params) { require('internal').print(params); })(params)", 
   "database" : "_system", 
   "error" : false, 
diff --git a/Documentation/Examples/RestTraversalAny.generated b/Documentation/Examples/RestTraversalAny.generated
index 0a1822698b..109cf3e6e0 100644
--- a/Documentation/Examples/RestTraversalAny.generated
+++ b/Documentation/Examples/RestTraversalAny.generated
@@ -11,37 +11,37 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1310386523", 
+          "_rev" : "1308729645", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1311238491", 
+          "_rev" : "1309581613", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1310583131", 
+          "_rev" : "1308926253", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1310386523", 
+          "_rev" : "1308729645", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1310845275", 
+          "_rev" : "1309188397", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1311041883", 
+          "_rev" : "1309385005", 
           "name" : "Dave" 
         } 
       ], 
@@ -52,7 +52,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1310386523", 
+              "_rev" : "1308729645", 
               "name" : "Alice" 
             } 
           ] 
@@ -60,9 +60,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1312090459", 
-              "_key" : "1312090459", 
-              "_rev" : "1312090459", 
+              "_id" : "knows/1310433581", 
+              "_key" : "1310433581", 
+              "_rev" : "1310433581", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -71,13 +71,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1310386523", 
+              "_rev" : "1308729645", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1311238491", 
+              "_rev" : "1309581613", 
               "name" : "Eve" 
             } 
           ] 
@@ -85,16 +85,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1312090459", 
-              "_key" : "1312090459", 
-              "_rev" : "1312090459", 
+              "_id" : "knows/1310433581", 
+              "_key" : "1310433581", 
+              "_rev" : "1310433581", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1312287067", 
-              "_key" : "1312287067", 
-              "_rev" : "1312287067", 
+              "_id" : "knows/1310630189", 
+              "_key" : "1310630189", 
+              "_rev" : "1310630189", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -103,19 +103,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1310386523", 
+              "_rev" : "1308729645", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1311238491", 
+              "_rev" : "1309581613", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1310583131", 
+              "_rev" : "1308926253", 
               "name" : "Bob" 
             } 
           ] 
@@ -123,23 +123,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1312090459", 
-              "_key" : "1312090459", 
-              "_rev" : "1312090459", 
+              "_id" : "knows/1310433581", 
+              "_key" : "1310433581", 
+              "_rev" : "1310433581", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1312287067", 
-              "_key" : "1312287067", 
-              "_rev" : "1312287067", 
+              "_id" : "knows/1310630189", 
+              "_key" : "1310630189", 
+              "_rev" : "1310630189", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1311500635", 
-              "_key" : "1311500635", 
-              "_rev" : "1311500635", 
+              "_id" : "knows/1309843757", 
+              "_key" : "1309843757", 
+              "_rev" : "1309843757", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -148,25 +148,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1310386523", 
+              "_rev" : "1308729645", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1311238491", 
+              "_rev" : "1309581613", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1310583131", 
+              "_rev" : "1308926253", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1310386523", 
+              "_rev" : "1308729645", 
               "name" : "Alice" 
             } 
           ] 
@@ -174,23 +174,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1312090459", 
-              "_key" : "1312090459", 
-              "_rev" : "1312090459", 
+              "_id" : "knows/1310433581", 
+              "_key" : "1310433581", 
+              "_rev" : "1310433581", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1312287067", 
-              "_key" : "1312287067", 
-              "_rev" : "1312287067", 
+              "_id" : "knows/1310630189", 
+              "_key" : "1310630189", 
+              "_rev" : "1310630189", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1311697243", 
-              "_key" : "1311697243", 
-              "_rev" : "1311697243", 
+              "_id" : "knows/1310040365", 
+              "_key" : "1310040365", 
+              "_rev" : "1310040365", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -199,25 +199,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1310386523", 
+              "_rev" : "1308729645", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1311238491", 
+              "_rev" : "1309581613", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1310583131", 
+              "_rev" : "1308926253", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1310845275", 
+              "_rev" : "1309188397", 
               "name" : "Charlie" 
             } 
           ] 
@@ -225,23 +225,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1312090459", 
-              "_key" : "1312090459", 
-              "_rev" : "1312090459", 
+              "_id" : "knows/1310433581", 
+              "_key" : "1310433581", 
+              "_rev" : "1310433581", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1312287067", 
-              "_key" : "1312287067", 
-              "_rev" : "1312287067", 
+              "_id" : "knows/1310630189", 
+              "_key" : "1310630189", 
+              "_rev" : "1310630189", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1311893851", 
-              "_key" : "1311893851", 
-              "_rev" : "1311893851", 
+              "_id" : "knows/1310236973", 
+              "_key" : "1310236973", 
+              "_rev" : "1310236973", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -250,25 +250,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1310386523", 
+              "_rev" : "1308729645", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1311238491", 
+              "_rev" : "1309581613", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1310583131", 
+              "_rev" : "1308926253", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1311041883", 
+              "_rev" : "1309385005", 
               "name" : "Dave" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalBackwardItemOrder.generated b/Documentation/Examples/RestTraversalBackwardItemOrder.generated
index f79e28967f..c29487cd67 100644
--- a/Documentation/Examples/RestTraversalBackwardItemOrder.generated
+++ b/Documentation/Examples/RestTraversalBackwardItemOrder.generated
@@ -11,67 +11,67 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1353902427", 
+          "_rev" : "1352245549", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1354099035", 
+          "_rev" : "1352442157", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1354557787", 
+          "_rev" : "1352900909", 
           "name" : "Dave" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1354361179", 
+          "_rev" : "1352704301", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1354754395", 
+          "_rev" : "1353097517", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1353902427", 
+          "_rev" : "1352245549", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1354754395", 
+          "_rev" : "1353097517", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1354099035", 
+          "_rev" : "1352442157", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1354557787", 
+          "_rev" : "1352900909", 
           "name" : "Dave" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1354361179", 
+          "_rev" : "1352704301", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1353902427", 
+          "_rev" : "1352245549", 
           "name" : "Alice" 
         } 
       ], 
@@ -82,7 +82,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             } 
           ] 
@@ -90,9 +90,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355016539", 
-              "_key" : "1355016539", 
-              "_rev" : "1355016539", 
+              "_id" : "knows/1353359661", 
+              "_key" : "1353359661", 
+              "_rev" : "1353359661", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -101,13 +101,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             } 
           ] 
@@ -115,16 +115,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355016539", 
-              "_key" : "1355016539", 
-              "_rev" : "1355016539", 
+              "_id" : "knows/1353359661", 
+              "_key" : "1353359661", 
+              "_rev" : "1353359661", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1355409755", 
-              "_key" : "1355409755", 
-              "_rev" : "1355409755", 
+              "_id" : "knows/1353752877", 
+              "_key" : "1353752877", 
+              "_rev" : "1353752877", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -133,19 +133,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1354557787", 
+              "_rev" : "1352900909", 
               "name" : "Dave" 
             } 
           ] 
@@ -153,16 +153,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355016539", 
-              "_key" : "1355016539", 
-              "_rev" : "1355016539", 
+              "_id" : "knows/1353359661", 
+              "_key" : "1353359661", 
+              "_rev" : "1353359661", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1355213147", 
-              "_key" : "1355213147", 
-              "_rev" : "1355213147", 
+              "_id" : "knows/1353556269", 
+              "_key" : "1353556269", 
+              "_rev" : "1353556269", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -171,19 +171,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1354361179", 
+              "_rev" : "1352704301", 
               "name" : "Charlie" 
             } 
           ] 
@@ -191,16 +191,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355016539", 
-              "_key" : "1355016539", 
-              "_rev" : "1355016539", 
+              "_id" : "knows/1353359661", 
+              "_key" : "1353359661", 
+              "_rev" : "1353359661", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1355802971", 
-              "_key" : "1355802971", 
-              "_rev" : "1355802971", 
+              "_id" : "knows/1354146093", 
+              "_key" : "1354146093", 
+              "_rev" : "1354146093", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -209,19 +209,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1354754395", 
+              "_rev" : "1353097517", 
               "name" : "Eve" 
             } 
           ] 
@@ -229,23 +229,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355016539", 
-              "_key" : "1355016539", 
-              "_rev" : "1355016539", 
+              "_id" : "knows/1353359661", 
+              "_key" : "1353359661", 
+              "_rev" : "1353359661", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1355802971", 
-              "_key" : "1355802971", 
-              "_rev" : "1355802971", 
+              "_id" : "knows/1354146093", 
+              "_key" : "1354146093", 
+              "_rev" : "1354146093", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1355606363", 
-              "_key" : "1355606363", 
-              "_rev" : "1355606363", 
+              "_id" : "knows/1353949485", 
+              "_key" : "1353949485", 
+              "_rev" : "1353949485", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -254,25 +254,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1354754395", 
+              "_rev" : "1353097517", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             } 
           ] 
@@ -280,9 +280,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355606363", 
-              "_key" : "1355606363", 
-              "_rev" : "1355606363", 
+              "_id" : "knows/1353949485", 
+              "_key" : "1353949485", 
+              "_rev" : "1353949485", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -291,13 +291,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1354754395", 
+              "_rev" : "1353097517", 
               "name" : "Eve" 
             } 
           ] 
@@ -305,16 +305,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355606363", 
-              "_key" : "1355606363", 
-              "_rev" : "1355606363", 
+              "_id" : "knows/1353949485", 
+              "_key" : "1353949485", 
+              "_rev" : "1353949485", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1355802971", 
-              "_key" : "1355802971", 
-              "_rev" : "1355802971", 
+              "_id" : "knows/1354146093", 
+              "_key" : "1354146093", 
+              "_rev" : "1354146093", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -323,19 +323,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1354754395", 
+              "_rev" : "1353097517", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             } 
           ] 
@@ -343,23 +343,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355606363", 
-              "_key" : "1355606363", 
-              "_rev" : "1355606363", 
+              "_id" : "knows/1353949485", 
+              "_key" : "1353949485", 
+              "_rev" : "1353949485", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1355802971", 
-              "_key" : "1355802971", 
-              "_rev" : "1355802971", 
+              "_id" : "knows/1354146093", 
+              "_key" : "1354146093", 
+              "_rev" : "1354146093", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1355409755", 
-              "_key" : "1355409755", 
-              "_rev" : "1355409755", 
+              "_id" : "knows/1353752877", 
+              "_key" : "1353752877", 
+              "_rev" : "1353752877", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -368,25 +368,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1354754395", 
+              "_rev" : "1353097517", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1354557787", 
+              "_rev" : "1352900909", 
               "name" : "Dave" 
             } 
           ] 
@@ -394,23 +394,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355606363", 
-              "_key" : "1355606363", 
-              "_rev" : "1355606363", 
+              "_id" : "knows/1353949485", 
+              "_key" : "1353949485", 
+              "_rev" : "1353949485", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1355802971", 
-              "_key" : "1355802971", 
-              "_rev" : "1355802971", 
+              "_id" : "knows/1354146093", 
+              "_key" : "1354146093", 
+              "_rev" : "1354146093", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1355213147", 
-              "_key" : "1355213147", 
-              "_rev" : "1355213147", 
+              "_id" : "knows/1353556269", 
+              "_key" : "1353556269", 
+              "_rev" : "1353556269", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -419,25 +419,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1354754395", 
+              "_rev" : "1353097517", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1354361179", 
+              "_rev" : "1352704301", 
               "name" : "Charlie" 
             } 
           ] 
@@ -445,23 +445,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1355606363", 
-              "_key" : "1355606363", 
-              "_rev" : "1355606363", 
+              "_id" : "knows/1353949485", 
+              "_key" : "1353949485", 
+              "_rev" : "1353949485", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1355802971", 
-              "_key" : "1355802971", 
-              "_rev" : "1355802971", 
+              "_id" : "knows/1354146093", 
+              "_key" : "1354146093", 
+              "_rev" : "1354146093", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1355016539", 
-              "_key" : "1355016539", 
-              "_rev" : "1355016539", 
+              "_id" : "knows/1353359661", 
+              "_key" : "1353359661", 
+              "_rev" : "1353359661", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -470,25 +470,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1354754395", 
+              "_rev" : "1353097517", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1354099035", 
+              "_rev" : "1352442157", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1353902427", 
+              "_rev" : "1352245549", 
               "name" : "Alice" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalDepthFirst.generated b/Documentation/Examples/RestTraversalDepthFirst.generated
index c2f5a103bc..64d3c8e9ea 100644
--- a/Documentation/Examples/RestTraversalDepthFirst.generated
+++ b/Documentation/Examples/RestTraversalDepthFirst.generated
@@ -11,67 +11,67 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1341581659", 
+          "_rev" : "1339924781", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1342433627", 
+          "_rev" : "1340776749", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1341778267", 
+          "_rev" : "1340121389", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1341581659", 
+          "_rev" : "1339924781", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1342040411", 
+          "_rev" : "1340383533", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1342237019", 
+          "_rev" : "1340580141", 
           "name" : "Dave" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1341778267", 
+          "_rev" : "1340121389", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1342433627", 
+          "_rev" : "1340776749", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1341581659", 
+          "_rev" : "1339924781", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1342040411", 
+          "_rev" : "1340383533", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1342237019", 
+          "_rev" : "1340580141", 
           "name" : "Dave" 
         } 
       ], 
@@ -82,7 +82,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             } 
           ] 
@@ -90,9 +90,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1343285595", 
-              "_key" : "1343285595", 
-              "_rev" : "1343285595", 
+              "_id" : "knows/1341628717", 
+              "_key" : "1341628717", 
+              "_rev" : "1341628717", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -101,13 +101,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1342433627", 
+              "_rev" : "1340776749", 
               "name" : "Eve" 
             } 
           ] 
@@ -115,16 +115,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1343285595", 
-              "_key" : "1343285595", 
-              "_rev" : "1343285595", 
+              "_id" : "knows/1341628717", 
+              "_key" : "1341628717", 
+              "_rev" : "1341628717", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1343482203", 
-              "_key" : "1343482203", 
-              "_rev" : "1343482203", 
+              "_id" : "knows/1341825325", 
+              "_key" : "1341825325", 
+              "_rev" : "1341825325", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -133,19 +133,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1342433627", 
+              "_rev" : "1340776749", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             } 
           ] 
@@ -153,23 +153,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1343285595", 
-              "_key" : "1343285595", 
-              "_rev" : "1343285595", 
+              "_id" : "knows/1341628717", 
+              "_key" : "1341628717", 
+              "_rev" : "1341628717", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1343482203", 
-              "_key" : "1343482203", 
-              "_rev" : "1343482203", 
+              "_id" : "knows/1341825325", 
+              "_key" : "1341825325", 
+              "_rev" : "1341825325", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1342695771", 
-              "_key" : "1342695771", 
-              "_rev" : "1342695771", 
+              "_id" : "knows/1341038893", 
+              "_key" : "1341038893", 
+              "_rev" : "1341038893", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -178,25 +178,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1342433627", 
+              "_rev" : "1340776749", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             } 
           ] 
@@ -204,23 +204,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1343285595", 
-              "_key" : "1343285595", 
-              "_rev" : "1343285595", 
+              "_id" : "knows/1341628717", 
+              "_key" : "1341628717", 
+              "_rev" : "1341628717", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1343482203", 
-              "_key" : "1343482203", 
-              "_rev" : "1343482203", 
+              "_id" : "knows/1341825325", 
+              "_key" : "1341825325", 
+              "_rev" : "1341825325", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1342892379", 
-              "_key" : "1342892379", 
-              "_rev" : "1342892379", 
+              "_id" : "knows/1341235501", 
+              "_key" : "1341235501", 
+              "_rev" : "1341235501", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -229,25 +229,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1342433627", 
+              "_rev" : "1340776749", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1342040411", 
+              "_rev" : "1340383533", 
               "name" : "Charlie" 
             } 
           ] 
@@ -255,23 +255,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1343285595", 
-              "_key" : "1343285595", 
-              "_rev" : "1343285595", 
+              "_id" : "knows/1341628717", 
+              "_key" : "1341628717", 
+              "_rev" : "1341628717", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1343482203", 
-              "_key" : "1343482203", 
-              "_rev" : "1343482203", 
+              "_id" : "knows/1341825325", 
+              "_key" : "1341825325", 
+              "_rev" : "1341825325", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1343088987", 
-              "_key" : "1343088987", 
-              "_rev" : "1343088987", 
+              "_id" : "knows/1341432109", 
+              "_key" : "1341432109", 
+              "_rev" : "1341432109", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -280,25 +280,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1342433627", 
+              "_rev" : "1340776749", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1342237019", 
+              "_rev" : "1340580141", 
               "name" : "Dave" 
             } 
           ] 
@@ -306,9 +306,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1342695771", 
-              "_key" : "1342695771", 
-              "_rev" : "1342695771", 
+              "_id" : "knows/1341038893", 
+              "_key" : "1341038893", 
+              "_rev" : "1341038893", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -317,13 +317,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             } 
           ] 
@@ -331,16 +331,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1342695771", 
-              "_key" : "1342695771", 
-              "_rev" : "1342695771", 
+              "_id" : "knows/1341038893", 
+              "_key" : "1341038893", 
+              "_rev" : "1341038893", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1343482203", 
-              "_key" : "1343482203", 
-              "_rev" : "1343482203", 
+              "_id" : "knows/1341825325", 
+              "_key" : "1341825325", 
+              "_rev" : "1341825325", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -349,19 +349,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1342433627", 
+              "_rev" : "1340776749", 
               "name" : "Eve" 
             } 
           ] 
@@ -369,23 +369,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1342695771", 
-              "_key" : "1342695771", 
-              "_rev" : "1342695771", 
+              "_id" : "knows/1341038893", 
+              "_key" : "1341038893", 
+              "_rev" : "1341038893", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1343482203", 
-              "_key" : "1343482203", 
-              "_rev" : "1343482203", 
+              "_id" : "knows/1341825325", 
+              "_key" : "1341825325", 
+              "_rev" : "1341825325", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1343285595", 
-              "_key" : "1343285595", 
-              "_rev" : "1343285595", 
+              "_id" : "knows/1341628717", 
+              "_key" : "1341628717", 
+              "_rev" : "1341628717", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -394,25 +394,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1342433627", 
+              "_rev" : "1340776749", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             } 
           ] 
@@ -420,16 +420,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1342695771", 
-              "_key" : "1342695771", 
-              "_rev" : "1342695771", 
+              "_id" : "knows/1341038893", 
+              "_key" : "1341038893", 
+              "_rev" : "1341038893", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1342892379", 
-              "_key" : "1342892379", 
-              "_rev" : "1342892379", 
+              "_id" : "knows/1341235501", 
+              "_key" : "1341235501", 
+              "_rev" : "1341235501", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -438,19 +438,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1342040411", 
+              "_rev" : "1340383533", 
               "name" : "Charlie" 
             } 
           ] 
@@ -458,16 +458,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1342695771", 
-              "_key" : "1342695771", 
-              "_rev" : "1342695771", 
+              "_id" : "knows/1341038893", 
+              "_key" : "1341038893", 
+              "_rev" : "1341038893", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1343088987", 
-              "_key" : "1343088987", 
-              "_rev" : "1343088987", 
+              "_id" : "knows/1341432109", 
+              "_key" : "1341432109", 
+              "_rev" : "1341432109", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -476,19 +476,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1341581659", 
+              "_rev" : "1339924781", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1341778267", 
+              "_rev" : "1340121389", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1342237019", 
+              "_rev" : "1340580141", 
               "name" : "Dave" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalEdgeUniqueness.generated b/Documentation/Examples/RestTraversalEdgeUniqueness.generated
index 3f31483d8a..9cc91d9d25 100644
--- a/Documentation/Examples/RestTraversalEdgeUniqueness.generated
+++ b/Documentation/Examples/RestTraversalEdgeUniqueness.generated
@@ -11,37 +11,37 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1360062811", 
+          "_rev" : "1358405933", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1360914779", 
+          "_rev" : "1359257901", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1360259419", 
+          "_rev" : "1358602541", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1360062811", 
+          "_rev" : "1358405933", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1360521563", 
+          "_rev" : "1358864685", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1360718171", 
+          "_rev" : "1359061293", 
           "name" : "Dave" 
         } 
       ], 
@@ -52,7 +52,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1360062811", 
+              "_rev" : "1358405933", 
               "name" : "Alice" 
             } 
           ] 
@@ -60,9 +60,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1361766747", 
-              "_key" : "1361766747", 
-              "_rev" : "1361766747", 
+              "_id" : "knows/1360109869", 
+              "_key" : "1360109869", 
+              "_rev" : "1360109869", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -71,13 +71,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1360062811", 
+              "_rev" : "1358405933", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1360914779", 
+              "_rev" : "1359257901", 
               "name" : "Eve" 
             } 
           ] 
@@ -85,16 +85,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1361766747", 
-              "_key" : "1361766747", 
-              "_rev" : "1361766747", 
+              "_id" : "knows/1360109869", 
+              "_key" : "1360109869", 
+              "_rev" : "1360109869", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1361963355", 
-              "_key" : "1361963355", 
-              "_rev" : "1361963355", 
+              "_id" : "knows/1360306477", 
+              "_key" : "1360306477", 
+              "_rev" : "1360306477", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -103,19 +103,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1360062811", 
+              "_rev" : "1358405933", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1360914779", 
+              "_rev" : "1359257901", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1360259419", 
+              "_rev" : "1358602541", 
               "name" : "Bob" 
             } 
           ] 
@@ -123,23 +123,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1361766747", 
-              "_key" : "1361766747", 
-              "_rev" : "1361766747", 
+              "_id" : "knows/1360109869", 
+              "_key" : "1360109869", 
+              "_rev" : "1360109869", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1361963355", 
-              "_key" : "1361963355", 
-              "_rev" : "1361963355", 
+              "_id" : "knows/1360306477", 
+              "_key" : "1360306477", 
+              "_rev" : "1360306477", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1361176923", 
-              "_key" : "1361176923", 
-              "_rev" : "1361176923", 
+              "_id" : "knows/1359520045", 
+              "_key" : "1359520045", 
+              "_rev" : "1359520045", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -148,25 +148,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1360062811", 
+              "_rev" : "1358405933", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1360914779", 
+              "_rev" : "1359257901", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1360259419", 
+              "_rev" : "1358602541", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1360062811", 
+              "_rev" : "1358405933", 
               "name" : "Alice" 
             } 
           ] 
@@ -174,23 +174,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1361766747", 
-              "_key" : "1361766747", 
-              "_rev" : "1361766747", 
+              "_id" : "knows/1360109869", 
+              "_key" : "1360109869", 
+              "_rev" : "1360109869", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1361963355", 
-              "_key" : "1361963355", 
-              "_rev" : "1361963355", 
+              "_id" : "knows/1360306477", 
+              "_key" : "1360306477", 
+              "_rev" : "1360306477", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1361373531", 
-              "_key" : "1361373531", 
-              "_rev" : "1361373531", 
+              "_id" : "knows/1359716653", 
+              "_key" : "1359716653", 
+              "_rev" : "1359716653", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -199,25 +199,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1360062811", 
+              "_rev" : "1358405933", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1360914779", 
+              "_rev" : "1359257901", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1360259419", 
+              "_rev" : "1358602541", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1360521563", 
+              "_rev" : "1358864685", 
               "name" : "Charlie" 
             } 
           ] 
@@ -225,23 +225,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1361766747", 
-              "_key" : "1361766747", 
-              "_rev" : "1361766747", 
+              "_id" : "knows/1360109869", 
+              "_key" : "1360109869", 
+              "_rev" : "1360109869", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1361963355", 
-              "_key" : "1361963355", 
-              "_rev" : "1361963355", 
+              "_id" : "knows/1360306477", 
+              "_key" : "1360306477", 
+              "_rev" : "1360306477", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1361570139", 
-              "_key" : "1361570139", 
-              "_rev" : "1361570139", 
+              "_id" : "knows/1359913261", 
+              "_key" : "1359913261", 
+              "_rev" : "1359913261", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -250,25 +250,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1360062811", 
+              "_rev" : "1358405933", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1360914779", 
+              "_rev" : "1359257901", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1360259419", 
+              "_rev" : "1358602541", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1360718171", 
+              "_rev" : "1359061293", 
               "name" : "Dave" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalFilterExclude.generated b/Documentation/Examples/RestTraversalFilterExclude.generated
index 6dbaf516b0..8534dbda4b 100644
--- a/Documentation/Examples/RestTraversalFilterExclude.generated
+++ b/Documentation/Examples/RestTraversalFilterExclude.generated
@@ -11,13 +11,13 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1315563867", 
+          "_rev" : "1313906989", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1316219227", 
+          "_rev" : "1314562349", 
           "name" : "Dave" 
         } 
       ], 
@@ -28,7 +28,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1315563867", 
+              "_rev" : "1313906989", 
               "name" : "Alice" 
             } 
           ] 
@@ -36,16 +36,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1316677979", 
-              "_key" : "1316677979", 
-              "_rev" : "1316677979", 
+              "_id" : "knows/1315021101", 
+              "_key" : "1315021101", 
+              "_rev" : "1315021101", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1317071195", 
-              "_key" : "1317071195", 
-              "_rev" : "1317071195", 
+              "_id" : "knows/1315414317", 
+              "_key" : "1315414317", 
+              "_rev" : "1315414317", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -54,19 +54,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1315563867", 
+              "_rev" : "1313906989", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1315760475", 
+              "_rev" : "1314103597", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1316219227", 
+              "_rev" : "1314562349", 
               "name" : "Dave" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalFilterPrune.generated b/Documentation/Examples/RestTraversalFilterPrune.generated
index 7281121624..9130d86f08 100644
--- a/Documentation/Examples/RestTraversalFilterPrune.generated
+++ b/Documentation/Examples/RestTraversalFilterPrune.generated
@@ -11,13 +11,13 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1320020315", 
+          "_rev" : "1318363437", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1320216923", 
+          "_rev" : "1318560045", 
           "name" : "Bob" 
         } 
       ], 
@@ -28,7 +28,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1320020315", 
+              "_rev" : "1318363437", 
               "name" : "Alice" 
             } 
           ] 
@@ -36,9 +36,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1321134427", 
-              "_key" : "1321134427", 
-              "_rev" : "1321134427", 
+              "_id" : "knows/1319477549", 
+              "_key" : "1319477549", 
+              "_rev" : "1319477549", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -47,13 +47,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1320020315", 
+              "_rev" : "1318363437", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1320216923", 
+              "_rev" : "1318560045", 
               "name" : "Bob" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalInbound.generated b/Documentation/Examples/RestTraversalInbound.generated
index f18c0441e6..c9a0dd4af6 100644
--- a/Documentation/Examples/RestTraversalInbound.generated
+++ b/Documentation/Examples/RestTraversalInbound.generated
@@ -11,13 +11,13 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1306192219", 
+          "_rev" : "1304535341", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1307044187", 
+          "_rev" : "1305387309", 
           "name" : "Eve" 
         } 
       ], 
@@ -28,7 +28,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1306192219", 
+              "_rev" : "1304535341", 
               "name" : "Alice" 
             } 
           ] 
@@ -36,9 +36,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1307896155", 
-              "_key" : "1307896155", 
-              "_rev" : "1307896155", 
+              "_id" : "knows/1306239277", 
+              "_key" : "1306239277", 
+              "_rev" : "1306239277", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -47,13 +47,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1306192219", 
+              "_rev" : "1304535341", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1307044187", 
+              "_rev" : "1305387309", 
               "name" : "Eve" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalMaxDepth.generated b/Documentation/Examples/RestTraversalMaxDepth.generated
index e099594930..5e54704889 100644
--- a/Documentation/Examples/RestTraversalMaxDepth.generated
+++ b/Documentation/Examples/RestTraversalMaxDepth.generated
@@ -11,13 +11,13 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1328671067", 
+          "_rev" : "1326948653", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1328867675", 
+          "_rev" : "1327145261", 
           "name" : "Bob" 
         } 
       ], 
@@ -28,7 +28,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1328671067", 
+              "_rev" : "1326948653", 
               "name" : "Alice" 
             } 
           ] 
@@ -36,9 +36,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1329785179", 
-              "_key" : "1329785179", 
-              "_rev" : "1329785179", 
+              "_id" : "knows/1328062765", 
+              "_key" : "1328062765", 
+              "_rev" : "1328062765", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -47,13 +47,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1328671067", 
+              "_rev" : "1326948653", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1328867675", 
+              "_rev" : "1327145261", 
               "name" : "Bob" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalMinDepth.generated b/Documentation/Examples/RestTraversalMinDepth.generated
index f9d5303318..cdae727061 100644
--- a/Documentation/Examples/RestTraversalMinDepth.generated
+++ b/Documentation/Examples/RestTraversalMinDepth.generated
@@ -11,13 +11,13 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1324607835", 
+          "_rev" : "1322950957", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1324804443", 
+          "_rev" : "1323147565", 
           "name" : "Dave" 
         } 
       ], 
@@ -25,16 +25,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1325263195", 
-              "_key" : "1325263195", 
-              "_rev" : "1325263195", 
+              "_id" : "knows/1323606317", 
+              "_key" : "1323606317", 
+              "_rev" : "1323606317", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1325459803", 
-              "_key" : "1325459803", 
-              "_rev" : "1325459803", 
+              "_id" : "knows/1323802925", 
+              "_key" : "1323802925", 
+              "_rev" : "1323802925", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -43,19 +43,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1324149083", 
+              "_rev" : "1322492205", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1324345691", 
+              "_rev" : "1322688813", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1324607835", 
+              "_rev" : "1322950957", 
               "name" : "Charlie" 
             } 
           ] 
@@ -63,16 +63,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1325263195", 
-              "_key" : "1325263195", 
-              "_rev" : "1325263195", 
+              "_id" : "knows/1323606317", 
+              "_key" : "1323606317", 
+              "_rev" : "1323606317", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1325656411", 
-              "_key" : "1325656411", 
-              "_rev" : "1325656411", 
+              "_id" : "knows/1323999533", 
+              "_key" : "1323999533", 
+              "_rev" : "1323999533", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -81,19 +81,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1324149083", 
+              "_rev" : "1322492205", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1324345691", 
+              "_rev" : "1322688813", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1324804443", 
+              "_rev" : "1323147565", 
               "name" : "Dave" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalOutbound.generated b/Documentation/Examples/RestTraversalOutbound.generated
index a986dda7ec..3497852eaf 100644
--- a/Documentation/Examples/RestTraversalOutbound.generated
+++ b/Documentation/Examples/RestTraversalOutbound.generated
@@ -11,25 +11,25 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1301735771", 
+          "_rev" : "1300078893", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1301932379", 
+          "_rev" : "1300275501", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1302194523", 
+          "_rev" : "1300537645", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1302391131", 
+          "_rev" : "1300734253", 
           "name" : "Dave" 
         } 
       ], 
@@ -40,7 +40,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1301735771", 
+              "_rev" : "1300078893", 
               "name" : "Alice" 
             } 
           ] 
@@ -48,9 +48,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1302849883", 
-              "_key" : "1302849883", 
-              "_rev" : "1302849883", 
+              "_id" : "knows/1301193005", 
+              "_key" : "1301193005", 
+              "_rev" : "1301193005", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -59,13 +59,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1301735771", 
+              "_rev" : "1300078893", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1301932379", 
+              "_rev" : "1300275501", 
               "name" : "Bob" 
             } 
           ] 
@@ -73,16 +73,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1302849883", 
-              "_key" : "1302849883", 
-              "_rev" : "1302849883", 
+              "_id" : "knows/1301193005", 
+              "_key" : "1301193005", 
+              "_rev" : "1301193005", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1303046491", 
-              "_key" : "1303046491", 
-              "_rev" : "1303046491", 
+              "_id" : "knows/1301389613", 
+              "_key" : "1301389613", 
+              "_rev" : "1301389613", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -91,19 +91,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1301735771", 
+              "_rev" : "1300078893", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1301932379", 
+              "_rev" : "1300275501", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1302194523", 
+              "_rev" : "1300537645", 
               "name" : "Charlie" 
             } 
           ] 
@@ -111,16 +111,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1302849883", 
-              "_key" : "1302849883", 
-              "_rev" : "1302849883", 
+              "_id" : "knows/1301193005", 
+              "_key" : "1301193005", 
+              "_rev" : "1301193005", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1303243099", 
-              "_key" : "1303243099", 
-              "_rev" : "1303243099", 
+              "_id" : "knows/1301586221", 
+              "_key" : "1301586221", 
+              "_rev" : "1301586221", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -129,19 +129,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1301735771", 
+              "_rev" : "1300078893", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1301932379", 
+              "_rev" : "1300275501", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1302391131", 
+              "_rev" : "1300734253", 
               "name" : "Dave" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalPostorder.generated b/Documentation/Examples/RestTraversalPostorder.generated
index f6a0d22088..2237eb2f16 100644
--- a/Documentation/Examples/RestTraversalPostorder.generated
+++ b/Documentation/Examples/RestTraversalPostorder.generated
@@ -11,67 +11,67 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1347742043", 
+          "_rev" : "1346085165", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1348200795", 
+          "_rev" : "1346543917", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1348397403", 
+          "_rev" : "1346740525", 
           "name" : "Dave" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1347938651", 
+          "_rev" : "1346281773", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1348594011", 
+          "_rev" : "1346937133", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1347742043", 
+          "_rev" : "1346085165", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1348594011", 
+          "_rev" : "1346937133", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/charlie", 
           "_key" : "charlie", 
-          "_rev" : "1348200795", 
+          "_rev" : "1346543917", 
           "name" : "Charlie" 
         }, 
         { 
           "_id" : "persons/dave", 
           "_key" : "dave", 
-          "_rev" : "1348397403", 
+          "_rev" : "1346740525", 
           "name" : "Dave" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1347938651", 
+          "_rev" : "1346281773", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1347742043", 
+          "_rev" : "1346085165", 
           "name" : "Alice" 
         } 
       ], 
@@ -79,23 +79,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1349445979", 
-              "_key" : "1349445979", 
-              "_rev" : "1349445979", 
+              "_id" : "knows/1347789101", 
+              "_key" : "1347789101", 
+              "_rev" : "1347789101", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1349642587", 
-              "_key" : "1349642587", 
-              "_rev" : "1349642587", 
+              "_id" : "knows/1347985709", 
+              "_key" : "1347985709", 
+              "_rev" : "1347985709", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1348856155", 
-              "_key" : "1348856155", 
-              "_rev" : "1348856155", 
+              "_id" : "knows/1347199277", 
+              "_key" : "1347199277", 
+              "_rev" : "1347199277", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -104,25 +104,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1348594011", 
+              "_rev" : "1346937133", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             } 
           ] 
@@ -130,23 +130,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1349445979", 
-              "_key" : "1349445979", 
-              "_rev" : "1349445979", 
+              "_id" : "knows/1347789101", 
+              "_key" : "1347789101", 
+              "_rev" : "1347789101", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1349642587", 
-              "_key" : "1349642587", 
-              "_rev" : "1349642587", 
+              "_id" : "knows/1347985709", 
+              "_key" : "1347985709", 
+              "_rev" : "1347985709", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1349052763", 
-              "_key" : "1349052763", 
-              "_rev" : "1349052763", 
+              "_id" : "knows/1347395885", 
+              "_key" : "1347395885", 
+              "_rev" : "1347395885", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -155,25 +155,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1348594011", 
+              "_rev" : "1346937133", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1348200795", 
+              "_rev" : "1346543917", 
               "name" : "Charlie" 
             } 
           ] 
@@ -181,23 +181,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1349445979", 
-              "_key" : "1349445979", 
-              "_rev" : "1349445979", 
+              "_id" : "knows/1347789101", 
+              "_key" : "1347789101", 
+              "_rev" : "1347789101", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1349642587", 
-              "_key" : "1349642587", 
-              "_rev" : "1349642587", 
+              "_id" : "knows/1347985709", 
+              "_key" : "1347985709", 
+              "_rev" : "1347985709", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1349249371", 
-              "_key" : "1349249371", 
-              "_rev" : "1349249371", 
+              "_id" : "knows/1347592493", 
+              "_key" : "1347592493", 
+              "_rev" : "1347592493", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -206,25 +206,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1348594011", 
+              "_rev" : "1346937133", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1348397403", 
+              "_rev" : "1346740525", 
               "name" : "Dave" 
             } 
           ] 
@@ -232,16 +232,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1349445979", 
-              "_key" : "1349445979", 
-              "_rev" : "1349445979", 
+              "_id" : "knows/1347789101", 
+              "_key" : "1347789101", 
+              "_rev" : "1347789101", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1349642587", 
-              "_key" : "1349642587", 
-              "_rev" : "1349642587", 
+              "_id" : "knows/1347985709", 
+              "_key" : "1347985709", 
+              "_rev" : "1347985709", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -250,19 +250,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1348594011", 
+              "_rev" : "1346937133", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             } 
           ] 
@@ -270,9 +270,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1349445979", 
-              "_key" : "1349445979", 
-              "_rev" : "1349445979", 
+              "_id" : "knows/1347789101", 
+              "_key" : "1347789101", 
+              "_rev" : "1347789101", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -281,13 +281,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1348594011", 
+              "_rev" : "1346937133", 
               "name" : "Eve" 
             } 
           ] 
@@ -295,23 +295,23 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1348856155", 
-              "_key" : "1348856155", 
-              "_rev" : "1348856155", 
+              "_id" : "knows/1347199277", 
+              "_key" : "1347199277", 
+              "_rev" : "1347199277", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1349642587", 
-              "_key" : "1349642587", 
-              "_rev" : "1349642587", 
+              "_id" : "knows/1347985709", 
+              "_key" : "1347985709", 
+              "_rev" : "1347985709", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1349445979", 
-              "_key" : "1349445979", 
-              "_rev" : "1349445979", 
+              "_id" : "knows/1347789101", 
+              "_key" : "1347789101", 
+              "_rev" : "1347789101", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -320,25 +320,25 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1348594011", 
+              "_rev" : "1346937133", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             } 
           ] 
@@ -346,16 +346,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1348856155", 
-              "_key" : "1348856155", 
-              "_rev" : "1348856155", 
+              "_id" : "knows/1347199277", 
+              "_key" : "1347199277", 
+              "_rev" : "1347199277", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1349642587", 
-              "_key" : "1349642587", 
-              "_rev" : "1349642587", 
+              "_id" : "knows/1347985709", 
+              "_key" : "1347985709", 
+              "_rev" : "1347985709", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -364,19 +364,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1348594011", 
+              "_rev" : "1346937133", 
               "name" : "Eve" 
             } 
           ] 
@@ -384,16 +384,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1348856155", 
-              "_key" : "1348856155", 
-              "_rev" : "1348856155", 
+              "_id" : "knows/1347199277", 
+              "_key" : "1347199277", 
+              "_rev" : "1347199277", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1349052763", 
-              "_key" : "1349052763", 
-              "_rev" : "1349052763", 
+              "_id" : "knows/1347395885", 
+              "_key" : "1347395885", 
+              "_rev" : "1347395885", 
               "_from" : "persons/bob", 
               "_to" : "persons/charlie" 
             } 
@@ -402,19 +402,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/charlie", 
               "_key" : "charlie", 
-              "_rev" : "1348200795", 
+              "_rev" : "1346543917", 
               "name" : "Charlie" 
             } 
           ] 
@@ -422,16 +422,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1348856155", 
-              "_key" : "1348856155", 
-              "_rev" : "1348856155", 
+              "_id" : "knows/1347199277", 
+              "_key" : "1347199277", 
+              "_rev" : "1347199277", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             }, 
             { 
-              "_id" : "knows/1349249371", 
-              "_key" : "1349249371", 
-              "_rev" : "1349249371", 
+              "_id" : "knows/1347592493", 
+              "_key" : "1347592493", 
+              "_rev" : "1347592493", 
               "_from" : "persons/bob", 
               "_to" : "persons/dave" 
             } 
@@ -440,19 +440,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             }, 
             { 
               "_id" : "persons/dave", 
               "_key" : "dave", 
-              "_rev" : "1348397403", 
+              "_rev" : "1346740525", 
               "name" : "Dave" 
             } 
           ] 
@@ -460,9 +460,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1348856155", 
-              "_key" : "1348856155", 
-              "_rev" : "1348856155", 
+              "_id" : "knows/1347199277", 
+              "_key" : "1347199277", 
+              "_rev" : "1347199277", 
               "_from" : "persons/alice", 
               "_to" : "persons/bob" 
             } 
@@ -471,13 +471,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1347938651", 
+              "_rev" : "1346281773", 
               "name" : "Bob" 
             } 
           ] 
@@ -488,7 +488,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1347742043", 
+              "_rev" : "1346085165", 
               "name" : "Alice" 
             } 
           ] 
diff --git a/Documentation/Examples/RestTraversalVisitorCountAndList.generated b/Documentation/Examples/RestTraversalVisitorCountAndList.generated
index 2642c94172..127de9f84e 100644
--- a/Documentation/Examples/RestTraversalVisitorCountAndList.generated
+++ b/Documentation/Examples/RestTraversalVisitorCountAndList.generated
@@ -11,25 +11,25 @@ content-type: application/json; charset=utf-8
       { 
         "_id" : "persons/alice", 
         "_key" : "alice", 
-        "_rev" : "1332799835", 
+        "_rev" : "1331077421", 
         "name" : "Alice" 
       }, 
       { 
         "_id" : "persons/bob", 
         "_key" : "bob", 
-        "_rev" : "1332996443", 
+        "_rev" : "1331274029", 
         "name" : "Bob" 
       }, 
       { 
         "_id" : "persons/charlie", 
         "_key" : "charlie", 
-        "_rev" : "1333258587", 
+        "_rev" : "1331536173", 
         "name" : "Charlie" 
       }, 
       { 
         "_id" : "persons/dave", 
         "_key" : "dave", 
-        "_rev" : "1333455195", 
+        "_rev" : "1331732781", 
         "name" : "Dave" 
       } 
     ] 
diff --git a/Documentation/Examples/RestTraversalVisitorExpander.generated b/Documentation/Examples/RestTraversalVisitorExpander.generated
index b2a6712c2b..44f2c7152b 100644
--- a/Documentation/Examples/RestTraversalVisitorExpander.generated
+++ b/Documentation/Examples/RestTraversalVisitorExpander.generated
@@ -11,19 +11,19 @@ content-type: application/json; charset=utf-8
         { 
           "_id" : "persons/alice", 
           "_key" : "alice", 
-          "_rev" : "1337256283", 
+          "_rev" : "1335599405", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "persons/eve", 
           "_key" : "eve", 
-          "_rev" : "1338108251", 
+          "_rev" : "1336451373", 
           "name" : "Eve" 
         }, 
         { 
           "_id" : "persons/bob", 
           "_key" : "bob", 
-          "_rev" : "1337452891", 
+          "_rev" : "1335796013", 
           "name" : "Bob" 
         } 
       ], 
@@ -34,7 +34,7 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1337256283", 
+              "_rev" : "1335599405", 
               "name" : "Alice" 
             } 
           ] 
@@ -42,9 +42,9 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1338960219", 
-              "_key" : "1338960219", 
-              "_rev" : "1338960219", 
+              "_id" : "knows/1337303341", 
+              "_key" : "1337303341", 
+              "_rev" : "1337303341", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             } 
@@ -53,13 +53,13 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1337256283", 
+              "_rev" : "1335599405", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1338108251", 
+              "_rev" : "1336451373", 
               "name" : "Eve" 
             } 
           ] 
@@ -67,16 +67,16 @@ content-type: application/json; charset=utf-8
         { 
           "edges" : [ 
             { 
-              "_id" : "knows/1338960219", 
-              "_key" : "1338960219", 
-              "_rev" : "1338960219", 
+              "_id" : "knows/1337303341", 
+              "_key" : "1337303341", 
+              "_rev" : "1337303341", 
               "_from" : "persons/eve", 
               "_to" : "persons/alice" 
             }, 
             { 
-              "_id" : "knows/1339156827", 
-              "_key" : "1339156827", 
-              "_rev" : "1339156827", 
+              "_id" : "knows/1337499949", 
+              "_key" : "1337499949", 
+              "_rev" : "1337499949", 
               "_from" : "persons/eve", 
               "_to" : "persons/bob" 
             } 
@@ -85,19 +85,19 @@ content-type: application/json; charset=utf-8
             { 
               "_id" : "persons/alice", 
               "_key" : "alice", 
-              "_rev" : "1337256283", 
+              "_rev" : "1335599405", 
               "name" : "Alice" 
             }, 
             { 
               "_id" : "persons/eve", 
               "_key" : "eve", 
-              "_rev" : "1338108251", 
+              "_rev" : "1336451373", 
               "name" : "Eve" 
             }, 
             { 
               "_id" : "persons/bob", 
               "_key" : "bob", 
-              "_rev" : "1337452891", 
+              "_rev" : "1335796013", 
               "name" : "Bob" 
             } 
           ] 
diff --git a/Documentation/Examples/RestVersion.generated b/Documentation/Examples/RestVersion.generated
index 8fe32baeec..26e38768d5 100644
--- a/Documentation/Examples/RestVersion.generated
+++ b/Documentation/Examples/RestVersion.generated
@@ -5,5 +5,5 @@ content-type: application/json; charset=utf-8
 
 { 
   "server" : "arango", 
-  "version" : "2.5.0-alpha5" 
+  "version" : "2.5.0-alpha6" 
 }
diff --git a/Documentation/Examples/RestVersionDetails.generated b/Documentation/Examples/RestVersionDetails.generated
index 714043bec1..666fcc0d56 100644
--- a/Documentation/Examples/RestVersionDetails.generated
+++ b/Documentation/Examples/RestVersionDetails.generated
@@ -5,17 +5,17 @@ content-type: application/json; charset=utf-8
 
 { 
   "server" : "arango", 
-  "version" : "2.5.0-alpha5", 
+  "version" : "2.5.0-alpha6", 
   "details" : { 
     "architecture" : "64bit", 
-    "build-date" : "2015-02-18 23:03:58", 
+    "build-date" : "2015-02-19 12:05:23", 
     "configure" : "'./configure' '--enable-maintainer-mode' '--disable-mruby'", 
     "icu-version" : "52.1", 
     "libev-version" : "4.11", 
     "maintainer-mode" : "true", 
     "openssl-version" : "OpenSSL 0.9.8za 5 Jun 2014", 
-    "repository-version" : "heads/2.5-0-g068ac6df4054274ed9cfa451bd186e7598ffe540-dirty", 
-    "server-version" : "2.5.0-alpha5", 
+    "repository-version" : "heads/2.5-0-g512e0c634e6be7e3b8182f3236f5973c52047502-dirty", 
+    "server-version" : "2.5.0-alpha6", 
     "sizeof int" : "4", 
     "sizeof void*" : "8", 
     "v8-version" : "3.31.74.1" 
diff --git a/Documentation/Examples/SaveEdgeCol.generated b/Documentation/Examples/SaveEdgeCol.generated
index 2edd27495c..d3706e9ab7 100644
--- a/Documentation/Examples/SaveEdgeCol.generated
+++ b/Documentation/Examples/SaveEdgeCol.generated
@@ -1,30 +1,30 @@
 arangosh> v1 = db.vertex.insert({ name : "vertex 1" });
 { 
   "error" : false, 
-  "_id" : "vertex/532670811", 
-  "_rev" : "532670811", 
-  "_key" : "532670811" 
+  "_id" : "vertex/530686253", 
+  "_rev" : "530686253", 
+  "_key" : "530686253" 
 }
 arangosh> v2 = db.vertex.insert({ name : "vertex 2" });
 { 
   "error" : false, 
-  "_id" : "vertex/532867419", 
-  "_rev" : "532867419", 
-  "_key" : "532867419" 
+  "_id" : "vertex/530882861", 
+  "_rev" : "530882861", 
+  "_key" : "530882861" 
 }
 arangosh> e1 = db.relation.insert(v1, v2, { label : "knows" });
 { 
   "error" : false, 
-  "_id" : "relation/533195099", 
-  "_rev" : "533195099", 
-  "_key" : "533195099" 
+  "_id" : "relation/531210541", 
+  "_rev" : "531210541", 
+  "_key" : "531210541" 
 }
 arangosh> db._document(e1);
 { 
   "label" : "knows", 
-  "_id" : "relation/533195099", 
-  "_rev" : "533195099", 
-  "_key" : "533195099", 
-  "_from" : "vertex/532670811", 
-  "_to" : "vertex/532867419" 
+  "_id" : "relation/531210541", 
+  "_rev" : "531210541", 
+  "_key" : "531210541", 
+  "_from" : "vertex/530686253", 
+  "_to" : "vertex/530882861" 
 }
diff --git a/Documentation/Examples/collectionAll.generated b/Documentation/Examples/collectionAll.generated
index c38807f6da..3e783025b8 100644
--- a/Documentation/Examples/collectionAll.generated
+++ b/Documentation/Examples/collectionAll.generated
@@ -1,33 +1,33 @@
 arangosh> db.five.all().toArray();
 [ 
   { 
-    "_id" : "five/777513307", 
-    "_key" : "777513307", 
-    "_rev" : "777513307", 
+    "_id" : "five/774938925", 
+    "_key" : "774938925", 
+    "_rev" : "774938925", 
     "name" : "four" 
   }, 
   { 
-    "_id" : "five/777316699", 
-    "_key" : "777316699", 
-    "_rev" : "777316699", 
-    "name" : "three" 
-  }, 
-  { 
-    "_id" : "five/776923483", 
-    "_key" : "776923483", 
-    "_rev" : "776923483", 
-    "name" : "one" 
-  }, 
-  { 
-    "_id" : "five/777709915", 
-    "_key" : "777709915", 
-    "_rev" : "777709915", 
+    "_id" : "five/775135533", 
+    "_key" : "775135533", 
+    "_rev" : "775135533", 
     "name" : "five" 
   }, 
   { 
-    "_id" : "five/777120091", 
-    "_key" : "777120091", 
-    "_rev" : "777120091", 
+    "_id" : "five/774545709", 
+    "_key" : "774545709", 
+    "_rev" : "774545709", 
     "name" : "two" 
+  }, 
+  { 
+    "_id" : "five/774742317", 
+    "_key" : "774742317", 
+    "_rev" : "774742317", 
+    "name" : "three" 
+  }, 
+  { 
+    "_id" : "five/774349101", 
+    "_key" : "774349101", 
+    "_rev" : "774349101", 
+    "name" : "one" 
   } 
 ]
diff --git a/Documentation/Examples/collectionAllNext.generated b/Documentation/Examples/collectionAllNext.generated
index d032a3d8a2..15af95f7ec 100644
--- a/Documentation/Examples/collectionAllNext.generated
+++ b/Documentation/Examples/collectionAllNext.generated
@@ -1,15 +1,15 @@
 arangosh> db.five.all().limit(2).toArray();
 [ 
   { 
-    "_id" : "five/141814107", 
-    "_key" : "141814107", 
-    "_rev" : "141814107", 
-    "name" : "one" 
+    "_id" : "five/142516525", 
+    "_key" : "142516525", 
+    "_rev" : "142516525", 
+    "name" : "five" 
   }, 
   { 
-    "_id" : "five/142207323", 
-    "_key" : "142207323", 
-    "_rev" : "142207323", 
-    "name" : "three" 
+    "_id" : "five/141730093", 
+    "_key" : "141730093", 
+    "_rev" : "141730093", 
+    "name" : "one" 
   } 
 ]
diff --git a/Documentation/Examples/collectionByExample.generated b/Documentation/Examples/collectionByExample.generated
index 78dd0e5d21..b7425c1356 100644
--- a/Documentation/Examples/collectionByExample.generated
+++ b/Documentation/Examples/collectionByExample.generated
@@ -1,21 +1,21 @@
 arangosh> db.users.all().toArray();
 [ 
   { 
-    "_id" : "users/482928987", 
-    "_key" : "482928987", 
-    "_rev" : "482928987", 
+    "_id" : "users/478716205", 
+    "_key" : "478716205", 
+    "_rev" : "478716205", 
     "name" : "Angela" 
   }, 
   { 
-    "_id" : "users/482732379", 
-    "_key" : "482732379", 
-    "_rev" : "482732379", 
+    "_id" : "users/478519597", 
+    "_key" : "478519597", 
+    "_rev" : "478519597", 
     "name" : "Helmut" 
   }, 
   { 
-    "_id" : "users/482470235", 
-    "_key" : "482470235", 
-    "_rev" : "482470235", 
+    "_id" : "users/478257453", 
+    "_key" : "478257453", 
+    "_rev" : "478257453", 
     "name" : "Gerhard" 
   } 
 ]
@@ -24,9 +24,9 @@ arangosh> db.users.byExample({ "_id" : "users/20" }).toArray();
 arangosh> db.users.byExample({ "name" : "Gerhard" }).toArray();
 [ 
   { 
-    "_id" : "users/482470235", 
-    "_key" : "482470235", 
-    "_rev" : "482470235", 
+    "_id" : "users/478257453", 
+    "_key" : "478257453", 
+    "_rev" : "478257453", 
     "name" : "Gerhard" 
   } 
 ]
diff --git a/Documentation/Examples/collectionByExampleNext.generated b/Documentation/Examples/collectionByExampleNext.generated
index ffb1bd35f8..2522673227 100644
--- a/Documentation/Examples/collectionByExampleNext.generated
+++ b/Documentation/Examples/collectionByExampleNext.generated
@@ -1,8 +1,8 @@
 arangosh> var a = db.users.byExample( {"name" : "Angela" } );
 arangosh> while (a.hasNext()) print(a.next());
 { 
-  "_id" : "users/785836379", 
-  "_key" : "785836379", 
-  "_rev" : "785836379", 
+  "_id" : "users/783261997", 
+  "_key" : "783261997", 
+  "_rev" : "783261997", 
   "name" : "Angela" 
 }
diff --git a/Documentation/Examples/collectionClosedRange.generated b/Documentation/Examples/collectionClosedRange.generated
index d3ba22f248..38847c190d 100644
--- a/Documentation/Examples/collectionClosedRange.generated
+++ b/Documentation/Examples/collectionClosedRange.generated
@@ -1,21 +1,21 @@
 arangosh> db.old.closedRange("age", 10, 30).toArray();
 [ 
   { 
-    "_id" : "old/488237403", 
-    "_key" : "488237403", 
-    "_rev" : "488237403", 
+    "_id" : "old/487235885", 
+    "_key" : "487235885", 
+    "_rev" : "487235885", 
     "age" : 15 
   }, 
   { 
-    "_id" : "old/488434011", 
-    "_key" : "488434011", 
-    "_rev" : "488434011", 
+    "_id" : "old/487432493", 
+    "_key" : "487432493", 
+    "_rev" : "487432493", 
     "age" : 25 
   }, 
   { 
-    "_id" : "old/488630619", 
-    "_key" : "488630619", 
-    "_rev" : "488630619", 
+    "_id" : "old/487629101", 
+    "_key" : "487629101", 
+    "_rev" : "487629101", 
     "age" : 30 
   } 
 ]
diff --git a/Documentation/Examples/collectionDatabaseCollectionName.generated b/Documentation/Examples/collectionDatabaseCollectionName.generated
index 8e635aded6..5220fee5aa 100644
--- a/Documentation/Examples/collectionDatabaseCollectionName.generated
+++ b/Documentation/Examples/collectionDatabaseCollectionName.generated
@@ -1,2 +1,2 @@
 arangosh> db.example;
-[ArangoCollection 456517979, "example" (type document, status loaded)]
+[ArangoCollection 452370733, "example" (type document, status loaded)]
diff --git a/Documentation/Examples/collectionDatabaseCreate.generated b/Documentation/Examples/collectionDatabaseCreate.generated
index ebe069ca35..509a3b1d09 100644
--- a/Documentation/Examples/collectionDatabaseCreate.generated
+++ b/Documentation/Examples/collectionDatabaseCreate.generated
@@ -1,5 +1,5 @@
 arangosh> c = db._create("users");
-[ArangoCollection 658237787, "users" (type document, status loaded)]
+[ArangoCollection 656122157, "users" (type document, status loaded)]
 arangosh> c.properties();
 { 
   "doCompact" : true, 
diff --git a/Documentation/Examples/collectionDatabaseCreateKey.generated b/Documentation/Examples/collectionDatabaseCreateKey.generated
index 0d7ebca02f..28dddb8600 100644
--- a/Documentation/Examples/collectionDatabaseCreateKey.generated
+++ b/Documentation/Examples/collectionDatabaseCreateKey.generated
@@ -1,23 +1,23 @@
 arangosh> db._create("users", { keyOptions: { type: "autoincrement", offset: 10, increment: 5 } });
-[ArangoCollection 97511771, "users" (type document, status loaded)]
+[ArangoCollection 97493293, "users" (type document, status loaded)]
 arangosh> db.users.save({ name: "user 1" });
 { 
   "error" : false, 
   "_id" : "users/10", 
-  "_rev" : "97839451", 
+  "_rev" : "97820973", 
   "_key" : "10" 
 }
 arangosh> db.users.save({ name: "user 2" });
 { 
   "error" : false, 
   "_id" : "users/15", 
-  "_rev" : "98036059", 
+  "_rev" : "98017581", 
   "_key" : "15" 
 }
 arangosh> db.users.save({ name: "user 3" });
 { 
   "error" : false, 
   "_id" : "users/20", 
-  "_rev" : "98232667", 
+  "_rev" : "98214189", 
   "_key" : "20" 
 }
diff --git a/Documentation/Examples/collectionDatabaseCreateProperties.generated b/Documentation/Examples/collectionDatabaseCreateProperties.generated
index 35bed0c41d..00c4b41219 100644
--- a/Documentation/Examples/collectionDatabaseCreateProperties.generated
+++ b/Documentation/Examples/collectionDatabaseCreateProperties.generated
@@ -1,5 +1,5 @@
 arangosh> c = db._create("users", { waitForSync : true, journalSize : 1024 * 1204 });
-[ArangoCollection 647883099, "users" (type document, status loaded)]
+[ArangoCollection 645833005, "users" (type document, status loaded)]
 arangosh> c.properties();
 { 
   "doCompact" : true, 
diff --git a/Documentation/Examples/collectionDatabaseCreateSpecialKey.generated b/Documentation/Examples/collectionDatabaseCreateSpecialKey.generated
index 6fb5121bcd..7d2f4610a7 100644
--- a/Documentation/Examples/collectionDatabaseCreateSpecialKey.generated
+++ b/Documentation/Examples/collectionDatabaseCreateSpecialKey.generated
@@ -1,18 +1,18 @@
 arangosh> db._create("users", { keyOptions: { allowUserKeys: false } });
-[ArangoCollection 781052251, "users" (type document, status loaded)]
+[ArangoCollection 778477869, "users" (type document, status loaded)]
 arangosh> db.users.save({ name: "user 1" });
 { 
   "error" : false, 
-  "_id" : "users/781379931", 
-  "_rev" : "781379931", 
-  "_key" : "781379931" 
+  "_id" : "users/778805549", 
+  "_rev" : "778805549", 
+  "_key" : "778805549" 
 }
 arangosh> db.users.save({ name: "user 2", _key: "myuser" });
 [ArangoError 1222: collection does not allow using user-defined keys]
 arangosh> db.users.save({ name: "user 3" });
 { 
   "error" : false, 
-  "_id" : "users/781707611", 
-  "_rev" : "781707611", 
-  "_key" : "781707611" 
+  "_id" : "users/779133229", 
+  "_rev" : "779133229", 
+  "_key" : "779133229" 
 }
diff --git a/Documentation/Examples/collectionDatabaseDrop.generated b/Documentation/Examples/collectionDatabaseDrop.generated
index 0377597b7a..7f4dcebfa6 100644
--- a/Documentation/Examples/collectionDatabaseDrop.generated
+++ b/Documentation/Examples/collectionDatabaseDrop.generated
@@ -1,5 +1,5 @@
 arangosh> col = db.example;
-[ArangoCollection 951904603, "example" (type document, status loaded)]
+[ArangoCollection 949330221, "example" (type document, status loaded)]
 arangosh> db._drop(col);
 arangosh> col;
-[ArangoCollection 951904603, "example" (type document, status loaded)]
+[ArangoCollection 949330221, "example" (type document, status loaded)]
diff --git a/Documentation/Examples/collectionDatabaseDropName.generated b/Documentation/Examples/collectionDatabaseDropName.generated
index 7fe9055273..6d44c979ea 100644
--- a/Documentation/Examples/collectionDatabaseDropName.generated
+++ b/Documentation/Examples/collectionDatabaseDropName.generated
@@ -1,5 +1,5 @@
 arangosh> col = db.example;
-[ArangoCollection 621341019, "example" (type document, status loaded)]
+[ArangoCollection 619290925, "example" (type document, status loaded)]
 arangosh> db._drop("example");
 arangosh> col;
-[ArangoCollection 621341019, "example" (type document, status deleted)]
+[ArangoCollection 619290925, "example" (type document, status deleted)]
diff --git a/Documentation/Examples/collectionDatabaseName.generated b/Documentation/Examples/collectionDatabaseName.generated
index 759ffe8d49..53efb2aa11 100644
--- a/Documentation/Examples/collectionDatabaseName.generated
+++ b/Documentation/Examples/collectionDatabaseName.generated
@@ -1,2 +1,2 @@
 arangosh> db._collection("demo");
-[ArangoCollection 23587163, "demo" (type document, status loaded)]
+[ArangoCollection 23568685, "demo" (type document, status loaded)]
diff --git a/Documentation/Examples/collectionDatabaseTruncate.generated b/Documentation/Examples/collectionDatabaseTruncate.generated
index eb0281b1c6..8189decebd 100644
--- a/Documentation/Examples/collectionDatabaseTruncate.generated
+++ b/Documentation/Examples/collectionDatabaseTruncate.generated
@@ -1,11 +1,11 @@
 arangosh> col = db.example;
-[ArangoCollection 28895579, "example" (type document, status loaded)]
+[ArangoCollection 28877101, "example" (type document, status loaded)]
 arangosh> col.save({ "Hello" : "World" });
 { 
   "error" : false, 
-  "_id" : "example/29223259", 
-  "_rev" : "29223259", 
-  "_key" : "29223259" 
+  "_id" : "example/29204781", 
+  "_rev" : "29204781", 
+  "_key" : "29204781" 
 }
 arangosh> col.count();
 1
diff --git a/Documentation/Examples/collectionDatabaseTruncateName.generated b/Documentation/Examples/collectionDatabaseTruncateName.generated
index a41ffeaefc..6874c7743b 100644
--- a/Documentation/Examples/collectionDatabaseTruncateName.generated
+++ b/Documentation/Examples/collectionDatabaseTruncateName.generated
@@ -1,11 +1,11 @@
 arangosh> col = db.example;
-[ArangoCollection 311748955, "example" (type document, status loaded)]
+[ArangoCollection 307601709, "example" (type document, status loaded)]
 arangosh> col.save({ "Hello" : "World" });
 { 
   "error" : false, 
-  "_id" : "example/312076635", 
-  "_rev" : "312076635", 
-  "_key" : "312076635" 
+  "_id" : "example/307929389", 
+  "_rev" : "307929389", 
+  "_key" : "307929389" 
 }
 arangosh> col.count();
 1
diff --git a/Documentation/Examples/collectionDrop.generated b/Documentation/Examples/collectionDrop.generated
index cc2afe602c..583008f465 100644
--- a/Documentation/Examples/collectionDrop.generated
+++ b/Documentation/Examples/collectionDrop.generated
@@ -1,5 +1,5 @@
 arangosh> col = db.example;
-[ArangoCollection 997910875, "example" (type document, status loaded)]
+[ArangoCollection 995795245, "example" (type document, status loaded)]
 arangosh> col.drop();
 arangosh> col;
-[ArangoCollection 997910875, "example" (type document, status deleted)]
+[ArangoCollection 995795245, "example" (type document, status deleted)]
diff --git a/Documentation/Examples/collectionFigures.generated b/Documentation/Examples/collectionFigures.generated
index d86744c407..84e507eef9 100644
--- a/Documentation/Examples/collectionFigures.generated
+++ b/Documentation/Examples/collectionFigures.generated
@@ -1,8 +1,8 @@
 arangosh> db.demo.figures()
 { 
   "alive" : { 
-    "count" : 0, 
-    "size" : 0 
+    "count" : 1, 
+    "size" : 256 
   }, 
   "dead" : { 
     "count" : 0, 
@@ -26,17 +26,17 @@ arangosh> db.demo.figures()
     "fileSize" : 0 
   }, 
   "shapes" : { 
-    "count" : 0, 
-    "size" : 0 
+    "count" : 2, 
+    "size" : 272 
   }, 
   "attributes" : { 
-    "count" : 0, 
-    "size" : 0 
+    "count" : 6, 
+    "size" : 304 
   }, 
   "indexes" : { 
     "count" : 1, 
     "size" : 2008 
   }, 
-  "lastTick" : "24373595", 
-  "uncollectedLogfileEntries" : 1 
+  "lastTick" : "24355117", 
+  "uncollectedLogfileEntries" : 0 
 }
diff --git a/Documentation/Examples/collectionFirstExample.generated b/Documentation/Examples/collectionFirstExample.generated
index ad6307adbf..4ad8d867ce 100644
--- a/Documentation/Examples/collectionFirstExample.generated
+++ b/Documentation/Examples/collectionFirstExample.generated
@@ -1,7 +1,7 @@
 arangosh> db.users.firstExample("name", "Angela");
 { 
-  "_id" : "users/122415451", 
-  "_key" : "122415451", 
-  "_rev" : "122415451", 
+  "_id" : "users/122331437", 
+  "_key" : "122331437", 
+  "_rev" : "122331437", 
   "name" : "Angela" 
 }
diff --git a/Documentation/Examples/collectionFulltext.generated b/Documentation/Examples/collectionFulltext.generated
index f19133569e..a1f3efa704 100644
--- a/Documentation/Examples/collectionFulltext.generated
+++ b/Documentation/Examples/collectionFulltext.generated
@@ -1,38 +1,38 @@
 arangosh> db.emails.ensureFulltextIndex("content").id;
-emails/800844123
+emails/798204205
 arangosh> db.emails.save({ content: "Hello Alice, how are you doing? Regards, Bob" });
 { 
   "error" : false, 
-  "_id" : "emails/801106267", 
-  "_rev" : "801106267", 
-  "_key" : "801106267" 
+  "_id" : "emails/798466349", 
+  "_rev" : "798466349", 
+  "_key" : "798466349" 
 }
 arangosh> db.emails.save({ content: "Hello Charlie, do Alice and Bob know about it?" });
 { 
   "error" : false, 
-  "_id" : "emails/801302875", 
-  "_rev" : "801302875", 
-  "_key" : "801302875" 
+  "_id" : "emails/798662957", 
+  "_rev" : "798662957", 
+  "_key" : "798662957" 
 }
 arangosh> db.emails.save({ content: "I think they don't know. Regards, Eve" });
 { 
   "error" : false, 
-  "_id" : "emails/801499483", 
-  "_rev" : "801499483", 
-  "_key" : "801499483" 
+  "_id" : "emails/798859565", 
+  "_rev" : "798859565", 
+  "_key" : "798859565" 
 }
 arangosh> db.emails.fulltext("content", "charlie,|eve").toArray();
 [ 
   { 
-    "_id" : "emails/801302875", 
-    "_key" : "801302875", 
-    "_rev" : "801302875", 
+    "_id" : "emails/798662957", 
+    "_key" : "798662957", 
+    "_rev" : "798662957", 
     "content" : "Hello Charlie, do Alice and Bob know about it?" 
   }, 
   { 
-    "_id" : "emails/801499483", 
-    "_key" : "801499483", 
-    "_rev" : "801499483", 
+    "_id" : "emails/798859565", 
+    "_key" : "798859565", 
+    "_rev" : "798859565", 
     "content" : "I think they don't know. Regards, Eve" 
   } 
 ]
diff --git a/Documentation/Examples/collectionLoad.generated b/Documentation/Examples/collectionLoad.generated
index 335a956468..9889595cc0 100644
--- a/Documentation/Examples/collectionLoad.generated
+++ b/Documentation/Examples/collectionLoad.generated
@@ -1,5 +1,5 @@
 arangosh> col = db.example;
-[ArangoCollection 468969819, "example" (type document, status loaded)]
+[ArangoCollection 464757037, "example" (type document, status loaded)]
 arangosh> col.load();
 arangosh> col;
-[ArangoCollection 468969819, "example" (type document, status loaded)]
+[ArangoCollection 464757037, "example" (type document, status loaded)]
diff --git a/Documentation/Examples/collectionNear.generated b/Documentation/Examples/collectionNear.generated
index 42d88e7449..321e08fe27 100644
--- a/Documentation/Examples/collectionNear.generated
+++ b/Documentation/Examples/collectionNear.generated
@@ -1,9 +1,9 @@
 arangosh> db.geo.near(0,0).limit(2).toArray();
 [ 
   { 
-    "_id" : "geo/387115355", 
-    "_rev" : "387115355", 
-    "_key" : "387115355", 
+    "_id" : "geo/382968109", 
+    "_rev" : "382968109", 
+    "_key" : "382968109", 
     "name" : "Name/0/0", 
     "loc" : [ 
       0, 
@@ -11,9 +11,9 @@ arangosh> db.geo.near(0,0).limit(2).toArray();
     ] 
   }, 
   { 
-    "_id" : "geo/379840859", 
-    "_rev" : "379840859", 
-    "_key" : "379840859", 
+    "_id" : "geo/375693613", 
+    "_rev" : "375693613", 
+    "_key" : "375693613", 
     "name" : "Name/-10/0", 
     "loc" : [ 
       -10, 
diff --git a/Documentation/Examples/collectionNearDistance.generated b/Documentation/Examples/collectionNearDistance.generated
index 5380c3e89e..8c2508eacf 100644
--- a/Documentation/Examples/collectionNearDistance.generated
+++ b/Documentation/Examples/collectionNearDistance.generated
@@ -1,9 +1,9 @@
 arangosh> db.geo.near(0, 0).distance().limit(2).toArray();
 [ 
   { 
-    "_id" : "geo/387115355", 
-    "_key" : "387115355", 
-    "_rev" : "387115355", 
+    "_id" : "geo/382968109", 
+    "_key" : "382968109", 
+    "_rev" : "382968109", 
     "name" : "Name/0/0", 
     "loc" : [ 
       0, 
@@ -12,9 +12,9 @@ arangosh> db.geo.near(0, 0).distance().limit(2).toArray();
     "distance" : 0 
   }, 
   { 
-    "_id" : "geo/379840859", 
-    "_key" : "379840859", 
-    "_rev" : "379840859", 
+    "_id" : "geo/375693613", 
+    "_key" : "375693613", 
+    "_rev" : "375693613", 
     "name" : "Name/-10/0", 
     "loc" : [ 
       -10, 
diff --git a/Documentation/Examples/collectionRange.generated b/Documentation/Examples/collectionRange.generated
index 49bd09616b..09f6713a91 100644
--- a/Documentation/Examples/collectionRange.generated
+++ b/Documentation/Examples/collectionRange.generated
@@ -1,15 +1,15 @@
 arangosh> db.old.range("age", 10, 30).toArray();
 [ 
   { 
-    "_id" : "old/567404891", 
-    "_key" : "567404891", 
-    "_rev" : "567404891", 
+    "_id" : "old/565420333", 
+    "_key" : "565420333", 
+    "_rev" : "565420333", 
     "age" : 15 
   }, 
   { 
-    "_id" : "old/567601499", 
-    "_key" : "567601499", 
-    "_rev" : "567601499", 
+    "_id" : "old/565616941", 
+    "_key" : "565616941", 
+    "_rev" : "565616941", 
     "age" : 25 
   } 
 ]
diff --git a/Documentation/Examples/collectionRename.generated b/Documentation/Examples/collectionRename.generated
index 11116c3bc9..d93bd5592e 100644
--- a/Documentation/Examples/collectionRename.generated
+++ b/Documentation/Examples/collectionRename.generated
@@ -1,5 +1,5 @@
 arangosh> c = db.example;
-[ArangoCollection 760146267, "example" (type document, status loaded)]
+[ArangoCollection 757506349, "example" (type document, status loaded)]
 arangosh> c.rename("better-example");
 arangosh> c;
-[ArangoCollection 760146267, "better-example" (type document, status loaded)]
+[ArangoCollection 757506349, "better-example" (type document, status loaded)]
diff --git a/Documentation/Examples/collectionTruncate.generated b/Documentation/Examples/collectionTruncate.generated
index e070159aa1..0cbe6c1da5 100644
--- a/Documentation/Examples/collectionTruncate.generated
+++ b/Documentation/Examples/collectionTruncate.generated
@@ -1,11 +1,11 @@
 arangosh> col = db.example;
-[ArangoCollection 138930523, "example" (type document, status loaded)]
+[ArangoCollection 138846509, "example" (type document, status loaded)]
 arangosh> col.save({ "Hello" : "World" });
 { 
   "error" : false, 
-  "_id" : "example/139258203", 
-  "_rev" : "139258203", 
-  "_key" : "139258203" 
+  "_id" : "example/139174189", 
+  "_rev" : "139174189", 
+  "_key" : "139174189" 
 }
 arangosh> col.count();
 1
diff --git a/Documentation/Examples/collectionWithin.generated b/Documentation/Examples/collectionWithin.generated
index 385f5d5882..625424b4a2 100644
--- a/Documentation/Examples/collectionWithin.generated
+++ b/Documentation/Examples/collectionWithin.generated
@@ -1,9 +1,9 @@
 arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
 [ 
   { 
-    "_id" : "geo/876210523", 
-    "_key" : "876210523", 
-    "_rev" : "876210523", 
+    "_id" : "geo/873636141", 
+    "_key" : "873636141", 
+    "_rev" : "873636141", 
     "name" : "Name/0/0", 
     "loc" : [ 
       0, 
@@ -12,9 +12,9 @@ arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
     "distance" : 0 
   }, 
   { 
-    "_id" : "geo/868936027", 
-    "_key" : "868936027", 
-    "_rev" : "868936027", 
+    "_id" : "geo/866361645", 
+    "_key" : "866361645", 
+    "_rev" : "866361645", 
     "name" : "Name/-10/0", 
     "loc" : [ 
       -10, 
@@ -23,9 +23,9 @@ arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
     "distance" : 1111949.2664455874 
   }, 
   { 
-    "_id" : "geo/876407131", 
-    "_key" : "876407131", 
-    "_rev" : "876407131", 
+    "_id" : "geo/873832749", 
+    "_key" : "873832749", 
+    "_rev" : "873832749", 
     "name" : "Name/0/10", 
     "loc" : [ 
       0, 
@@ -34,9 +34,9 @@ arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
     "distance" : 1111949.2664455874 
   }, 
   { 
-    "_id" : "geo/883485019", 
-    "_key" : "883485019", 
-    "_rev" : "883485019", 
+    "_id" : "geo/880910637", 
+    "_key" : "880910637", 
+    "_rev" : "880910637", 
     "name" : "Name/10/0", 
     "loc" : [ 
       10, 
@@ -45,9 +45,9 @@ arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
     "distance" : 1111949.2664455874 
   }, 
   { 
-    "_id" : "geo/876013915", 
-    "_key" : "876013915", 
-    "_rev" : "876013915", 
+    "_id" : "geo/873439533", 
+    "_key" : "873439533", 
+    "_rev" : "873439533", 
     "name" : "Name/0/-10", 
     "loc" : [ 
       0, 
@@ -56,9 +56,9 @@ arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
     "distance" : 1111949.2664455874 
   }, 
   { 
-    "_id" : "geo/869132635", 
-    "_key" : "869132635", 
-    "_rev" : "869132635", 
+    "_id" : "geo/866558253", 
+    "_key" : "866558253", 
+    "_rev" : "866558253", 
     "name" : "Name/-10/10", 
     "loc" : [ 
       -10, 
@@ -67,9 +67,9 @@ arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
     "distance" : 1568520.5567985761 
   }, 
   { 
-    "_id" : "geo/883681627", 
-    "_key" : "883681627", 
-    "_rev" : "883681627", 
+    "_id" : "geo/881107245", 
+    "_key" : "881107245", 
+    "_rev" : "881107245", 
     "name" : "Name/10/10", 
     "loc" : [ 
       10, 
@@ -78,9 +78,9 @@ arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
     "distance" : 1568520.5567985761 
   }, 
   { 
-    "_id" : "geo/868739419", 
-    "_key" : "868739419", 
-    "_rev" : "868739419", 
+    "_id" : "geo/866165037", 
+    "_key" : "866165037", 
+    "_rev" : "866165037", 
     "name" : "Name/-10/-10", 
     "loc" : [ 
       -10, 
@@ -89,9 +89,9 @@ arangosh> db.geo.within(0, 0, 2000 * 1000).distance().toArray();
     "distance" : 1568520.5567985761 
   }, 
   { 
-    "_id" : "geo/883288411", 
-    "_key" : "883288411", 
-    "_rev" : "883288411", 
+    "_id" : "geo/880714029", 
+    "_key" : "880714029", 
+    "_rev" : "880714029", 
     "name" : "Name/10/-10", 
     "loc" : [ 
       10, 
diff --git a/Documentation/Examples/collectionsDatabaseName.generated b/Documentation/Examples/collectionsDatabaseName.generated
index d5b8c6c898..af50cd8b72 100644
--- a/Documentation/Examples/collectionsDatabaseName.generated
+++ b/Documentation/Examples/collectionsDatabaseName.generated
@@ -1,31 +1,31 @@
 arangosh> db._collections();
 [ 
-  [ArangoCollection 24439131, "animals" (type document, status loaded)], 
-  [ArangoCollection 2615643, "_cluster_kickstarter_plans" (type document, status loaded)], 
-  [ArangoCollection 982247771, "relation" (type edge, status loaded)], 
-  [ArangoCollection 992471387, "frenchCity" (type document, status loaded)], 
-  [ArangoCollection 806545755, "geo" (type document, status loaded)], 
-  [ArangoCollection 996862299, "example" (type document, status loaded)], 
-  [ArangoCollection 4712795, "_statisticsRaw" (type document, status loaded)], 
-  [ArangoCollection 2484571, "_routing" (type document, status loaded)], 
-  [ArangoCollection 5106011, "_statistics" (type document, status loaded)], 
-  [ArangoCollection 640149851, "myEC1" (type edge, status loaded)], 
-  [ArangoCollection 982116699, "male" (type document, status loaded)], 
-  [ArangoCollection 992340315, "germanHighway" (type edge, status loaded)], 
-  [ArangoCollection 190811, "_configuration" (type document, status loaded)], 
-  [ArangoCollection 5499227, "_statistics15" (type document, status loaded)], 
-  [ArangoCollection 992733531, "internationalHighway" (type edge, status loaded)], 
-  [ArangoCollection 760146267, "better-example" (type document, status loaded)], 
-  [ArangoCollection 4581723, "_aqlfunctions" (type document, status loaded)], 
-  [ArangoCollection 2353499, "_modules" (type document, status loaded)], 
-  [ArangoCollection 6351195, "_jobs" (type document, status loaded)], 
-  [ArangoCollection 7203163, "_apps" (type document, status loaded)], 
-  [ArangoCollection 981985627, "female" (type document, status loaded)], 
-  [ArangoCollection 992209243, "germanCity" (type document, status loaded)], 
-  [ArangoCollection 16509275, "_system_sessions_sessions" (type document, status loaded)], 
-  [ArangoCollection 23587163, "demo" (type document, status loaded)], 
-  [ArangoCollection 992602459, "frenchHighway" (type edge, status loaded)], 
-  [ArangoCollection 452955, "_users" (type document, status loaded)], 
-  [ArangoCollection 2222427, "_graphs" (type document, status loaded)], 
-  [ArangoCollection 6220123, "_queues" (type document, status loaded)] 
+  [ArangoCollection 172333, "_configuration" (type document, status loaded)], 
+  [ArangoCollection 757506349, "better-example" (type document, status loaded)], 
+  [ArangoCollection 990093613, "germanCity" (type document, status loaded)], 
+  [ArangoCollection 5480749, "_statistics15" (type document, status loaded)], 
+  [ArangoCollection 990486829, "frenchHighway" (type edge, status loaded)], 
+  [ArangoCollection 4563245, "_aqlfunctions" (type document, status loaded)], 
+  [ArangoCollection 2335021, "_modules" (type document, status loaded)], 
+  [ArangoCollection 6332717, "_jobs" (type document, status loaded)], 
+  [ArangoCollection 979345709, "female" (type document, status loaded)], 
+  [ArangoCollection 7184685, "_apps" (type document, status loaded)], 
+  [ArangoCollection 16490797, "_system_sessions_sessions" (type document, status loaded)], 
+  [ArangoCollection 23568685, "demo" (type document, status loaded)], 
+  [ArangoCollection 434477, "_users" (type document, status loaded)], 
+  [ArangoCollection 990355757, "frenchCity" (type document, status loaded)], 
+  [ArangoCollection 2203949, "_graphs" (type document, status loaded)], 
+  [ArangoCollection 6201645, "_queues" (type document, status loaded)], 
+  [ArangoCollection 24420653, "animals" (type document, status loaded)], 
+  [ArangoCollection 994746669, "example" (type document, status loaded)], 
+  [ArangoCollection 2597165, "_cluster_kickstarter_plans" (type document, status loaded)], 
+  [ArangoCollection 979607853, "relation" (type edge, status loaded)], 
+  [ArangoCollection 638034221, "myEC1" (type edge, status loaded)], 
+  [ArangoCollection 803905837, "geo" (type document, status loaded)], 
+  [ArangoCollection 990224685, "germanHighway" (type edge, status loaded)], 
+  [ArangoCollection 990617901, "internationalHighway" (type edge, status loaded)], 
+  [ArangoCollection 4694317, "_statisticsRaw" (type document, status loaded)], 
+  [ArangoCollection 2466093, "_routing" (type document, status loaded)], 
+  [ArangoCollection 979476781, "male" (type document, status loaded)], 
+  [ArangoCollection 5087533, "_statistics" (type document, status loaded)] 
 ]
diff --git a/Documentation/Examples/cursorHasNext.generated b/Documentation/Examples/cursorHasNext.generated
index c649ab7496..f9dfdabcee 100644
--- a/Documentation/Examples/cursorHasNext.generated
+++ b/Documentation/Examples/cursorHasNext.generated
@@ -1,32 +1,32 @@
 arangosh> var a = db.five.all();
 arangosh> while (a.hasNext()) print(a.next());
 { 
-  "_id" : "five/657516891", 
-  "_key" : "657516891", 
-  "_rev" : "657516891", 
-  "name" : "three" 
+  "_id" : "five/655204653", 
+  "_key" : "655204653", 
+  "_rev" : "655204653", 
+  "name" : "two" 
 }
 { 
-  "_id" : "five/657910107", 
-  "_key" : "657910107", 
-  "_rev" : "657910107", 
+  "_id" : "five/655794477", 
+  "_key" : "655794477", 
+  "_rev" : "655794477", 
   "name" : "five" 
 }
 { 
-  "_id" : "five/657713499", 
-  "_key" : "657713499", 
-  "_rev" : "657713499", 
-  "name" : "four" 
-}
-{ 
-  "_id" : "five/657123675", 
-  "_key" : "657123675", 
-  "_rev" : "657123675", 
+  "_id" : "five/655008045", 
+  "_key" : "655008045", 
+  "_rev" : "655008045", 
   "name" : "one" 
 }
 { 
-  "_id" : "five/657320283", 
-  "_key" : "657320283", 
-  "_rev" : "657320283", 
-  "name" : "two" 
+  "_id" : "five/655401261", 
+  "_key" : "655401261", 
+  "_rev" : "655401261", 
+  "name" : "three" 
+}
+{ 
+  "_id" : "five/655597869", 
+  "_key" : "655597869", 
+  "_rev" : "655597869", 
+  "name" : "four" 
 }
diff --git a/Documentation/Examples/cursorNext.generated b/Documentation/Examples/cursorNext.generated
index ba6721cff4..b92293cc55 100644
--- a/Documentation/Examples/cursorNext.generated
+++ b/Documentation/Examples/cursorNext.generated
@@ -1,7 +1,7 @@
 arangosh> db.five.all().next();
 { 
-  "_id" : "five/231663963", 
-  "_key" : "231663963", 
-  "_rev" : "231663963", 
-  "name" : "one" 
+  "_id" : "five/231711021", 
+  "_key" : "231711021", 
+  "_rev" : "231711021", 
+  "name" : "four" 
 }
diff --git a/Documentation/Examples/documentDocumentRemove.generated b/Documentation/Examples/documentDocumentRemove.generated
index e3fff43eaa..593ca3e775 100644
--- a/Documentation/Examples/documentDocumentRemove.generated
+++ b/Documentation/Examples/documentDocumentRemove.generated
@@ -1,18 +1,18 @@
 arangosh> a1 = db.example.insert({ a : 1 });
 { 
   "error" : false, 
-  "_id" : "example/782231899", 
-  "_rev" : "782231899", 
-  "_key" : "782231899" 
+  "_id" : "example/779657517", 
+  "_rev" : "779657517", 
+  "_key" : "779657517" 
 }
 arangosh> db.example.document(a1);
 { 
   "a" : 1, 
-  "_id" : "example/782231899", 
-  "_rev" : "782231899", 
-  "_key" : "782231899" 
+  "_id" : "example/779657517", 
+  "_rev" : "779657517", 
+  "_key" : "779657517" 
 }
 arangosh> db.example.remove(a1);
 true
 arangosh> db.example.document(a1);
-[ArangoError 1202: document /_api/document/example/782231899 not found]
+[ArangoError 1202: document /_api/document/example/779657517 not found]
diff --git a/Documentation/Examples/documentDocumentRemoveConflict.generated b/Documentation/Examples/documentDocumentRemoveConflict.generated
index c45752e950..8af330ea85 100644
--- a/Documentation/Examples/documentDocumentRemoveConflict.generated
+++ b/Documentation/Examples/documentDocumentRemoveConflict.generated
@@ -1,20 +1,20 @@
 arangosh> a1 = db.example.insert({ a : 1 });
 { 
   "error" : false, 
-  "_id" : "example/120842587", 
-  "_rev" : "120842587", 
-  "_key" : "120842587" 
+  "_id" : "example/120758573", 
+  "_rev" : "120758573", 
+  "_key" : "120758573" 
 }
 arangosh> a2 = db.example.replace(a1, { a : 2 });
 { 
   "error" : false, 
-  "_id" : "example/120842587", 
-  "_rev" : "121039195", 
-  "_key" : "120842587" 
+  "_id" : "example/120758573", 
+  "_rev" : "120955181", 
+  "_key" : "120758573" 
 }
 arangosh> db.example.remove(a1);
 [ArangoError 1200: precondition failed]
 arangosh> db.example.remove(a1, true);
 true
 arangosh> db.example.document(a1);
-[ArangoError 1202: document /_api/document/example/120842587 not found]
+[ArangoError 1202: document /_api/document/example/120758573 not found]
diff --git a/Documentation/Examples/documentDocumentUpdate.generated b/Documentation/Examples/documentDocumentUpdate.generated
index 4bf965cd20..a393a036a0 100644
--- a/Documentation/Examples/documentDocumentUpdate.generated
+++ b/Documentation/Examples/documentDocumentUpdate.generated
@@ -1,16 +1,16 @@
 arangosh> a1 = db.example.insert({ a : 1 });
 { 
   "error" : false, 
-  "_id" : "example/1072752987", 
-  "_rev" : "1072752987", 
-  "_key" : "1072752987" 
+  "_id" : "example/1070506285", 
+  "_rev" : "1070506285", 
+  "_key" : "1070506285" 
 }
 arangosh> a2 = db._update(a1, { b : 2 });
 { 
   "error" : false, 
-  "_id" : "example/1072752987", 
-  "_rev" : "1073080667", 
-  "_key" : "1072752987" 
+  "_id" : "example/1070506285", 
+  "_rev" : "1070833965", 
+  "_key" : "1070506285" 
 }
 arangosh> a3 = db._update(a1, { c : 3 });
 [ArangoError 1200: precondition failed]
diff --git a/Documentation/Examples/documentsCollectionFirst.generated b/Documentation/Examples/documentsCollectionFirst.generated
index 21cb5cde68..870630a3a7 100644
--- a/Documentation/Examples/documentsCollectionFirst.generated
+++ b/Documentation/Examples/documentsCollectionFirst.generated
@@ -1,9 +1,9 @@
 arangosh> db.example.first(1);
 [ 
   { 
-    "_id" : "example/784460123", 
-    "_key" : "784460123", 
-    "_rev" : "784460123", 
+    "_id" : "example/781885741", 
+    "_key" : "781885741", 
+    "_rev" : "781885741", 
     "Hello" : "world" 
   } 
 ]
diff --git a/Documentation/Examples/documentsCollectionFirstNull.generated b/Documentation/Examples/documentsCollectionFirstNull.generated
index 53ddc1e330..22256b7a0c 100644
--- a/Documentation/Examples/documentsCollectionFirstNull.generated
+++ b/Documentation/Examples/documentsCollectionFirstNull.generated
@@ -1,7 +1,7 @@
 arangosh> db.example.first();
 { 
-  "_id" : "example/522053979", 
-  "_key" : "522053979", 
-  "_rev" : "522053979", 
+  "_id" : "example/520134957", 
+  "_key" : "520134957", 
+  "_rev" : "520134957", 
   "Hello" : "world" 
 }
diff --git a/Documentation/Examples/documentsCollectionInsert.generated b/Documentation/Examples/documentsCollectionInsert.generated
index 8c51c7a825..f1e09fd0d0 100644
--- a/Documentation/Examples/documentsCollectionInsert.generated
+++ b/Documentation/Examples/documentsCollectionInsert.generated
@@ -1,14 +1,14 @@
 arangosh> db.example.insert({ Hello : "World" });
 { 
   "error" : false, 
-  "_id" : "example/1008462171", 
-  "_rev" : "1008462171", 
-  "_key" : "1008462171" 
+  "_id" : "example/1006281005", 
+  "_rev" : "1006281005", 
+  "_key" : "1006281005" 
 }
 arangosh> db.example.insert({ Hello : "World" }, true);
 { 
   "error" : false, 
-  "_id" : "example/1008658779", 
-  "_rev" : "1008658779", 
-  "_key" : "1008658779" 
+  "_id" : "example/1006477613", 
+  "_rev" : "1006477613", 
+  "_key" : "1006477613" 
 }
diff --git a/Documentation/Examples/documentsCollectionLast.generated b/Documentation/Examples/documentsCollectionLast.generated
index 7100931405..976e416bd5 100644
--- a/Documentation/Examples/documentsCollectionLast.generated
+++ b/Documentation/Examples/documentsCollectionLast.generated
@@ -1,15 +1,15 @@
 arangosh> db.example.last(2);
 [ 
   { 
-    "_id" : "example/231074139", 
-    "_key" : "231074139", 
-    "_rev" : "231074139", 
+    "_id" : "example/230531373", 
+    "_key" : "230531373", 
+    "_rev" : "230531373", 
     "Foo" : "bar" 
   }, 
   { 
-    "_id" : "example/230746459", 
-    "_key" : "230746459", 
-    "_rev" : "230746459", 
+    "_id" : "example/230203693", 
+    "_key" : "230203693", 
+    "_rev" : "230203693", 
     "Hello" : "world" 
   } 
 ]
diff --git a/Documentation/Examples/documentsCollectionLastNull.generated b/Documentation/Examples/documentsCollectionLastNull.generated
index d45f69496a..2d4239e7ea 100644
--- a/Documentation/Examples/documentsCollectionLastNull.generated
+++ b/Documentation/Examples/documentsCollectionLastNull.generated
@@ -1,9 +1,9 @@
 arangosh> db.example.last(1);
 [ 
   { 
-    "_id" : "example/545974619", 
-    "_key" : "545974619", 
-    "_rev" : "545974619", 
+    "_id" : "example/543990061", 
+    "_key" : "543990061", 
+    "_rev" : "543990061", 
     "Hello" : "world" 
   } 
 ]
diff --git a/Documentation/Examples/documentsCollectionName.generated b/Documentation/Examples/documentsCollectionName.generated
index 9e90e9b0a7..2a33312bdd 100644
--- a/Documentation/Examples/documentsCollectionName.generated
+++ b/Documentation/Examples/documentsCollectionName.generated
@@ -1,6 +1,6 @@
 arangosh> db.example.document("example/2873916");
 { 
   "_id" : "example/2873916", 
-  "_rev" : "93514075", 
+  "_rev" : "93495597", 
   "_key" : "2873916" 
 }
diff --git a/Documentation/Examples/documentsCollectionRemove.generated b/Documentation/Examples/documentsCollectionRemove.generated
index 95027c44e8..066b121614 100644
--- a/Documentation/Examples/documentsCollectionRemove.generated
+++ b/Documentation/Examples/documentsCollectionRemove.generated
@@ -1,13 +1,13 @@
 arangosh> a1 = db.example.insert({ a : 1 });
 { 
   "error" : false, 
-  "_id" : "example/316795227", 
-  "_rev" : "316795227", 
-  "_key" : "316795227" 
+  "_id" : "example/312647981", 
+  "_rev" : "312647981", 
+  "_key" : "312647981" 
 }
 arangosh> db._remove(a1);
 true
 arangosh> db._remove(a1);
-[ArangoError 1202: document /_api/document/example/316795227 not found]
+[ArangoError 1202: document /_api/document/example/312647981 not found]
 arangosh> db._remove(a1, true);
 false
diff --git a/Documentation/Examples/documentsCollectionRemoveConflict.generated b/Documentation/Examples/documentsCollectionRemoveConflict.generated
index baa53fa328..0bf1a2bdc3 100644
--- a/Documentation/Examples/documentsCollectionRemoveConflict.generated
+++ b/Documentation/Examples/documentsCollectionRemoveConflict.generated
@@ -1,20 +1,20 @@
 arangosh> a1 = db.example.insert({ a : 1 });
 { 
   "error" : false, 
-  "_id" : "example/1039395163", 
-  "_rev" : "1039395163", 
-  "_key" : "1039395163" 
+  "_id" : "example/1037213997", 
+  "_rev" : "1037213997", 
+  "_key" : "1037213997" 
 }
 arangosh> a2 = db._replace(a1, { a : 2 });
 { 
   "error" : false, 
-  "_id" : "example/1039395163", 
-  "_rev" : "1039591771", 
-  "_key" : "1039395163" 
+  "_id" : "example/1037213997", 
+  "_rev" : "1037410605", 
+  "_key" : "1037213997" 
 }
 arangosh> db._remove(a1);
 [ArangoError 1200: precondition failed]
 arangosh> db._remove(a1, true);
 true
 arangosh> db._document(a1);
-[ArangoError 1202: document /_api/document/example/1039395163 not found]
+[ArangoError 1202: document /_api/document/example/1037213997 not found]
diff --git a/Documentation/Examples/documentsCollectionRemoveSignature.generated b/Documentation/Examples/documentsCollectionRemoveSignature.generated
index 58fd864f2d..0aaa9b0d21 100644
--- a/Documentation/Examples/documentsCollectionRemoveSignature.generated
+++ b/Documentation/Examples/documentsCollectionRemoveSignature.generated
@@ -1,9 +1,9 @@
 arangosh> db.example.insert({ a:  1 } );
 { 
   "error" : false, 
-  "_id" : "example/980609371", 
-  "_rev" : "980609371", 
-  "_key" : "980609371" 
+  "_id" : "example/977969453", 
+  "_rev" : "977969453", 
+  "_key" : "977969453" 
 }
 arangosh> db.example.remove("example/11265325374", {overwrite: true, waitForSync: false})
 false
diff --git a/Documentation/Examples/documentsCollectionReplace.generated b/Documentation/Examples/documentsCollectionReplace.generated
index 96d241d553..3d1cc83fb6 100644
--- a/Documentation/Examples/documentsCollectionReplace.generated
+++ b/Documentation/Examples/documentsCollectionReplace.generated
@@ -1,16 +1,16 @@
 arangosh> a1 = db.example.insert({ a : 1 });
 { 
   "error" : false, 
-  "_id" : "example/783608155", 
-  "_rev" : "783608155", 
-  "_key" : "783608155" 
+  "_id" : "example/781033773", 
+  "_rev" : "781033773", 
+  "_key" : "781033773" 
 }
 arangosh> a2 = db.example.replace(a1, { a : 2 });
 { 
   "error" : false, 
-  "_id" : "example/783608155", 
-  "_rev" : "783804763", 
-  "_key" : "783608155" 
+  "_id" : "example/781033773", 
+  "_rev" : "781230381", 
+  "_key" : "781033773" 
 }
 arangosh> a3 = db.example.replace(a1, { a : 3 });
 [ArangoError 1200: precondition failed]
diff --git a/Documentation/Examples/documentsCollectionReplaceHandle.generated b/Documentation/Examples/documentsCollectionReplaceHandle.generated
index f2cbb6aa69..ed06e165f3 100644
--- a/Documentation/Examples/documentsCollectionReplaceHandle.generated
+++ b/Documentation/Examples/documentsCollectionReplaceHandle.generated
@@ -1,14 +1,14 @@
 arangosh> a1 = db.example.insert({ a : 1 });
 { 
   "error" : false, 
-  "_id" : "example/497805659", 
-  "_rev" : "497805659", 
-  "_key" : "497805659" 
+  "_id" : "example/496804141", 
+  "_rev" : "496804141", 
+  "_key" : "496804141" 
 }
 arangosh> a2 = db.example.replace("example/3903044", { a : 2 });
 { 
   "error" : false, 
   "_id" : "example/3903044", 
-  "_rev" : "498002267", 
+  "_rev" : "497000749", 
   "_key" : "3903044" 
 }
diff --git a/Documentation/Examples/documentsCollectionUpdate.generated b/Documentation/Examples/documentsCollectionUpdate.generated
index 666bc06c52..f93fa85374 100644
--- a/Documentation/Examples/documentsCollectionUpdate.generated
+++ b/Documentation/Examples/documentsCollectionUpdate.generated
@@ -1,25 +1,25 @@
 arangosh> a1 = db.example.insert({"a" : 1});
 { 
   "error" : false, 
-  "_id" : "example/469559643", 
-  "_rev" : "469559643", 
-  "_key" : "469559643" 
+  "_id" : "example/465346861", 
+  "_rev" : "465346861", 
+  "_key" : "465346861" 
 }
 arangosh> a2 = db.example.update(a1, {"b" : 2, "c" : 3});
 { 
   "error" : false, 
-  "_id" : "example/469559643", 
-  "_rev" : "469952859", 
-  "_key" : "469559643" 
+  "_id" : "example/465346861", 
+  "_rev" : "465740077", 
+  "_key" : "465346861" 
 }
 arangosh> a3 = db.example.update(a1, {"d" : 4});
 [ArangoError 1200: precondition failed]
 arangosh> a4 = db.example.update(a2, {"e" : 5, "f" : 6 });
 { 
   "error" : false, 
-  "_id" : "example/469559643", 
-  "_rev" : "470608219", 
-  "_key" : "469559643" 
+  "_id" : "example/465346861", 
+  "_rev" : "466395437", 
+  "_key" : "465346861" 
 }
 arangosh> db.example.document(a4);
 { 
@@ -28,16 +28,16 @@ arangosh> db.example.document(a4);
   "c" : 3, 
   "e" : 5, 
   "f" : 6, 
-  "_id" : "example/469559643", 
-  "_rev" : "470608219", 
-  "_key" : "469559643" 
+  "_id" : "example/465346861", 
+  "_rev" : "466395437", 
+  "_key" : "465346861" 
 }
 arangosh> a5 = db.example.update(a4, {"a" : 1, c : 9, e : 42 });
 { 
   "error" : false, 
-  "_id" : "example/469559643", 
-  "_rev" : "470870363", 
-  "_key" : "469559643" 
+  "_id" : "example/465346861", 
+  "_rev" : "466657581", 
+  "_key" : "465346861" 
 }
 arangosh> db.example.document(a5);
 { 
@@ -46,7 +46,7 @@ arangosh> db.example.document(a5);
   "c" : 9, 
   "e" : 42, 
   "f" : 6, 
-  "_id" : "example/469559643", 
-  "_rev" : "470870363", 
-  "_key" : "469559643" 
+  "_id" : "example/465346861", 
+  "_rev" : "466657581", 
+  "_key" : "465346861" 
 }
diff --git a/Documentation/Examples/documentsCollectionUpdateHandle.generated b/Documentation/Examples/documentsCollectionUpdateHandle.generated
index d33092d0bd..7ff72170cd 100644
--- a/Documentation/Examples/documentsCollectionUpdateHandle.generated
+++ b/Documentation/Examples/documentsCollectionUpdateHandle.generated
@@ -1,14 +1,14 @@
 arangosh> a1 = db.example.insert({"a" : 1});
 { 
   "error" : false, 
-  "_id" : "example/50850139", 
-  "_rev" : "50850139", 
-  "_key" : "50850139" 
+  "_id" : "example/50897197", 
+  "_rev" : "50897197", 
+  "_key" : "50897197" 
 }
 arangosh> a2 = db.example.update("example/18612115", { "x" : 1, "y" : 2 });
 { 
   "error" : false, 
   "_id" : "example/18612115", 
-  "_rev" : "51243355", 
+  "_rev" : "51290413", 
   "_key" : "18612115" 
 }
diff --git a/Documentation/Examples/documentsCollectionUpdateHandleArray.generated b/Documentation/Examples/documentsCollectionUpdateHandleArray.generated
index 717c40a7e2..ccf2de3f67 100644
--- a/Documentation/Examples/documentsCollectionUpdateHandleArray.generated
+++ b/Documentation/Examples/documentsCollectionUpdateHandleArray.generated
@@ -1,15 +1,15 @@
 arangosh> db.example.insert({"a" : { "one" : 1, "two" : 2, "three" : 3 }, "b" : { }});
 { 
   "error" : false, 
-  "_id" : "example/638511451", 
-  "_rev" : "638511451", 
-  "_key" : "638511451" 
+  "_id" : "example/636395821", 
+  "_rev" : "636395821", 
+  "_key" : "636395821" 
 }
 arangosh> db.example.update("example/20774803", {"a" : { "four" : 4 }, "b" : { "b1" : 1 }});
 { 
   "error" : false, 
   "_id" : "example/20774803", 
-  "_rev" : "639035739", 
+  "_rev" : "636920109", 
   "_key" : "20774803" 
 }
 arangosh> db.example.document("example/20774803");
@@ -21,14 +21,14 @@ arangosh> db.example.document("example/20774803");
     "b1" : 1 
   }, 
   "_id" : "example/20774803", 
-  "_rev" : "639035739", 
+  "_rev" : "636920109", 
   "_key" : "20774803" 
 }
 arangosh> db.example.update("example/20774803", { "a" : { "one" : null }, "b" : null }, false, false);
 { 
   "error" : false, 
   "_id" : "example/20774803", 
-  "_rev" : "639363419", 
+  "_rev" : "637247789", 
   "_key" : "20774803" 
 }
 arangosh> db.example.document("example/20774803");
@@ -37,6 +37,6 @@ arangosh> db.example.document("example/20774803");
     "four" : 4 
   }, 
   "_id" : "example/20774803", 
-  "_rev" : "639363419", 
+  "_rev" : "637247789", 
   "_key" : "20774803" 
 }
diff --git a/Documentation/Examples/documentsCollectionUpdateHandleKeepNull.generated b/Documentation/Examples/documentsCollectionUpdateHandleKeepNull.generated
index 5dc5f708a0..b3d7109394 100644
--- a/Documentation/Examples/documentsCollectionUpdateHandleKeepNull.generated
+++ b/Documentation/Examples/documentsCollectionUpdateHandleKeepNull.generated
@@ -1,15 +1,15 @@
 arangosh> db.example.insert({"a" : 1});
 { 
   "error" : false, 
-  "_id" : "example/149678427", 
-  "_rev" : "149678427", 
-  "_key" : "149678427" 
+  "_id" : "example/149594413", 
+  "_rev" : "149594413", 
+  "_key" : "149594413" 
 }
 arangosh> db.example.update("example/19988371", { "b" : null, "c" : null, "d" : 3 });
 { 
   "error" : false, 
   "_id" : "example/19988371", 
-  "_rev" : "150137179", 
+  "_rev" : "150053165", 
   "_key" : "19988371" 
 }
 arangosh> db.example.document("example/19988371");
@@ -18,14 +18,14 @@ arangosh> db.example.document("example/19988371");
   "c" : null, 
   "d" : 3, 
   "_id" : "example/19988371", 
-  "_rev" : "150137179", 
+  "_rev" : "150053165", 
   "_key" : "19988371" 
 }
 arangosh> db.example.update("example/19988371", { "a" : null }, false, false);
 { 
   "error" : false, 
   "_id" : "example/19988371", 
-  "_rev" : "150399323", 
+  "_rev" : "150315309", 
   "_key" : "19988371" 
 }
 arangosh> db.example.document("example/19988371");
@@ -34,19 +34,19 @@ arangosh> db.example.document("example/19988371");
   "c" : null, 
   "d" : 3, 
   "_id" : "example/19988371", 
-  "_rev" : "150399323", 
+  "_rev" : "150315309", 
   "_key" : "19988371" 
 }
 arangosh> db.example.update("example/19988371", { "b" : null, "c": null, "d" : null }, false, false);
 { 
   "error" : false, 
   "_id" : "example/19988371", 
-  "_rev" : "150661467", 
+  "_rev" : "150577453", 
   "_key" : "19988371" 
 }
 arangosh> db.example.document("example/19988371");
 { 
   "_id" : "example/19988371", 
-  "_rev" : "150661467", 
+  "_rev" : "150577453", 
   "_key" : "19988371" 
 }
diff --git a/Documentation/Examples/documentsDocumentName.generated b/Documentation/Examples/documentsDocumentName.generated
index 96682b661a..5851ddc4ba 100644
--- a/Documentation/Examples/documentsDocumentName.generated
+++ b/Documentation/Examples/documentsDocumentName.generated
@@ -1,6 +1,6 @@
 arangosh> db._document("example/12345");
 { 
   "_id" : "example/12345", 
-  "_rev" : "1038805339", 
+  "_rev" : "1036624173", 
   "_key" : "12345" 
 }
diff --git a/Documentation/Examples/documentsDocumentReplace.generated b/Documentation/Examples/documentsDocumentReplace.generated
index 3735e3fe3e..8a87709a04 100644
--- a/Documentation/Examples/documentsDocumentReplace.generated
+++ b/Documentation/Examples/documentsDocumentReplace.generated
@@ -1,16 +1,16 @@
 arangosh> a1 = db.example.insert({ a : 1 });
 { 
   "error" : false, 
-  "_id" : "example/280619355", 
-  "_rev" : "280619355", 
-  "_key" : "280619355" 
+  "_id" : "example/276734253", 
+  "_rev" : "276734253", 
+  "_key" : "276734253" 
 }
 arangosh> a2 = db._replace(a1, { a : 2 });
 { 
   "error" : false, 
-  "_id" : "example/280619355", 
-  "_rev" : "280815963", 
-  "_key" : "280619355" 
+  "_id" : "example/276734253", 
+  "_rev" : "276930861", 
+  "_key" : "276734253" 
 }
 arangosh> a3 = db._replace(a1, { a : 3 });
 [ArangoError 1200: precondition failed]
diff --git a/Documentation/Examples/executeQuery.generated b/Documentation/Examples/executeQuery.generated
index 054a4ea7c5..cdeb69036e 100644
--- a/Documentation/Examples/executeQuery.generated
+++ b/Documentation/Examples/executeQuery.generated
@@ -1,22 +1,22 @@
 arangosh> result = db.users.all().toArray();
 [ 
   { 
-    "_id" : "users/686942555", 
-    "_key" : "686942555", 
-    "_rev" : "686942555", 
+    "_id" : "users/684826925", 
+    "_key" : "684826925", 
+    "_rev" : "684826925", 
     "name" : "Gerhard" 
   }, 
   { 
-    "_id" : "users/687401307", 
-    "_key" : "687401307", 
-    "_rev" : "687401307", 
-    "name" : "Angela" 
+    "_id" : "users/685089069", 
+    "_key" : "685089069", 
+    "_rev" : "685089069", 
+    "name" : "Helmut" 
   }, 
   { 
-    "_id" : "users/687204699", 
-    "_key" : "687204699", 
-    "_rev" : "687204699", 
-    "name" : "Helmut" 
+    "_id" : "users/685285677", 
+    "_key" : "685285677", 
+    "_rev" : "685285677", 
+    "name" : "Angela" 
   } 
 ]
 arangosh> q = db.users.all(); q.execute(); result = [ ]; while (q.hasNext()) { result.push(q.next()); }
diff --git a/Documentation/Examples/executeQueryBatchSize.generated b/Documentation/Examples/executeQueryBatchSize.generated
index 6cc9afe960..4c7fa291d5 100644
--- a/Documentation/Examples/executeQueryBatchSize.generated
+++ b/Documentation/Examples/executeQueryBatchSize.generated
@@ -1,40 +1,40 @@
 arangosh> q = db.users.all(); q.setBatchSize(20); q.execute(); while (q.hasNext()) { print(q.next()); }
 { 
-  "_id" : "users/653125979", 
-  "_key" : "653125979", 
-  "_rev" : "653125979", 
-  "name" : "Helmut" 
+  "_id" : "users/651272493", 
+  "_key" : "651272493", 
+  "_rev" : "651272493", 
+  "name" : "Angela" 
 }
 { 
-  "_id" : "users/652863835", 
-  "_key" : "652863835", 
-  "_rev" : "652863835", 
+  "_id" : "users/650813741", 
+  "_key" : "650813741", 
+  "_rev" : "650813741", 
   "name" : "Gerhard" 
 }
 { 
-  "_id" : "users/653322587", 
-  "_key" : "653322587", 
-  "_rev" : "653322587", 
-  "name" : "Angela" 
+  "_id" : "users/651075885", 
+  "_key" : "651075885", 
+  "_rev" : "651075885", 
+  "name" : "Helmut" 
 }
 SimpleQueryAll(users)
 arangosh> q = db.users.all(); q.execute(20); while (q.hasNext()) { print(q.next()); }
 { 
-  "_id" : "users/653125979", 
-  "_key" : "653125979", 
-  "_rev" : "653125979", 
-  "name" : "Helmut" 
+  "_id" : "users/651272493", 
+  "_key" : "651272493", 
+  "_rev" : "651272493", 
+  "name" : "Angela" 
 }
 { 
-  "_id" : "users/652863835", 
-  "_key" : "652863835", 
-  "_rev" : "652863835", 
+  "_id" : "users/650813741", 
+  "_key" : "650813741", 
+  "_rev" : "650813741", 
   "name" : "Gerhard" 
 }
 { 
-  "_id" : "users/653322587", 
-  "_key" : "653322587", 
-  "_rev" : "653322587", 
-  "name" : "Angela" 
+  "_id" : "users/651075885", 
+  "_key" : "651075885", 
+  "_rev" : "651075885", 
+  "name" : "Helmut" 
 }
 SimpleQueryAll(users)
diff --git a/Documentation/Examples/generalGraphAbsBetweenness1.generated b/Documentation/Examples/generalGraphAbsBetweenness1.generated
index 39e2c1ac35..7fe709f64f 100644
--- a/Documentation/Examples/generalGraphAbsBetweenness1.generated
+++ b/Documentation/Examples/generalGraphAbsBetweenness1.generated
@@ -3,10 +3,10 @@ arangosh> var g = examples.loadGraph("routeplanner");
 arangosh> db._query("RETURN GRAPH_ABSOLUTE_BETWEENNESS('routeplanner', {})").toArray();
 [ 
   { 
-    "germanCity/Hamburg" : 0, 
-    "germanCity/Cologne" : 0, 
     "germanCity/Berlin" : 0, 
-    "frenchCity/Lyon" : 0, 
-    "frenchCity/Paris" : 0 
+    "germanCity/Cologne" : 0, 
+    "germanCity/Hamburg" : 0, 
+    "frenchCity/Paris" : 0, 
+    "frenchCity/Lyon" : 0 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphAbsBetweenness2.generated b/Documentation/Examples/generalGraphAbsBetweenness2.generated
index e639e13226..2e99265fdd 100644
--- a/Documentation/Examples/generalGraphAbsBetweenness2.generated
+++ b/Documentation/Examples/generalGraphAbsBetweenness2.generated
@@ -5,8 +5,8 @@ arangosh> db._query("RETURN GRAPH_ABSOLUTE_BETWEENNESS("
 [ 
   { 
     "germanCity/Berlin" : 0, 
-    "germanCity/Cologne" : 2, 
     "germanCity/Hamburg" : 0, 
+    "germanCity/Cologne" : 2, 
     "frenchCity/Paris" : 0, 
     "frenchCity/Lyon" : 0 
   } 
diff --git a/Documentation/Examples/generalGraphAbsBetweenness3.generated b/Documentation/Examples/generalGraphAbsBetweenness3.generated
index 62f7f8412c..32585792b4 100644
--- a/Documentation/Examples/generalGraphAbsBetweenness3.generated
+++ b/Documentation/Examples/generalGraphAbsBetweenness3.generated
@@ -5,10 +5,10 @@ arangosh> db._query("RETURN GRAPH_ABSOLUTE_BETWEENNESS("
 ........> ).toArray();
 [ 
   { 
-    "germanCity/Berlin" : 0, 
     "germanCity/Hamburg" : 0, 
     "germanCity/Cologne" : 1, 
     "frenchCity/Paris" : 0, 
-    "frenchCity/Lyon" : 0 
+    "frenchCity/Lyon" : 0, 
+    "germanCity/Berlin" : 0 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphAbsCloseness1.generated b/Documentation/Examples/generalGraphAbsCloseness1.generated
index 47cae34041..9fd2910d2b 100644
--- a/Documentation/Examples/generalGraphAbsCloseness1.generated
+++ b/Documentation/Examples/generalGraphAbsCloseness1.generated
@@ -3,9 +3,9 @@ arangosh> var g = examples.loadGraph("routeplanner");
 arangosh> db._query("RETURN GRAPH_ABSOLUTE_CLOSENESS('routeplanner', {})").toArray();
 [ 
   { 
-    "germanCity/Hamburg" : 4, 
-    "germanCity/Cologne" : 4, 
     "germanCity/Berlin" : 4, 
+    "germanCity/Cologne" : 4, 
+    "germanCity/Hamburg" : 4, 
     "frenchCity/Paris" : 4, 
     "frenchCity/Lyon" : 4 
   } 
diff --git a/Documentation/Examples/generalGraphAbsCloseness2.generated b/Documentation/Examples/generalGraphAbsCloseness2.generated
index 270379d684..1e8977b94a 100644
--- a/Documentation/Examples/generalGraphAbsCloseness2.generated
+++ b/Documentation/Examples/generalGraphAbsCloseness2.generated
@@ -5,8 +5,8 @@ arangosh> db._query("RETURN GRAPH_ABSOLUTE_CLOSENESS("
 [ 
   { 
     "germanCity/Berlin" : 3550, 
-    "germanCity/Hamburg" : 3000, 
     "germanCity/Cologne" : 2600, 
+    "germanCity/Hamburg" : 3000, 
     "frenchCity/Paris" : 3200, 
     "frenchCity/Lyon" : 3550 
   } 
diff --git a/Documentation/Examples/generalGraphAbsEccentricity2.generated b/Documentation/Examples/generalGraphAbsEccentricity2.generated
index 062d26e9c0..fbe94a66e1 100644
--- a/Documentation/Examples/generalGraphAbsEccentricity2.generated
+++ b/Documentation/Examples/generalGraphAbsEccentricity2.generated
@@ -4,9 +4,9 @@ arangosh> db._query("RETURN GRAPH_ABSOLUTE_ECCENTRICITY("
 ........> +"'routeplanner', {}, {weight : 'distance'})").toArray();
 [ 
   { 
-    "germanCity/Berlin" : 1200, 
-    "germanCity/Cologne" : 850, 
     "germanCity/Hamburg" : 1200, 
+    "germanCity/Cologne" : 850, 
+    "germanCity/Berlin" : 1200, 
     "frenchCity/Paris" : 1200, 
     "frenchCity/Lyon" : 1200 
   } 
diff --git a/Documentation/Examples/generalGraphAbsEccentricity3.generated b/Documentation/Examples/generalGraphAbsEccentricity3.generated
index 7b5da13c23..d73c24fe0b 100644
--- a/Documentation/Examples/generalGraphAbsEccentricity3.generated
+++ b/Documentation/Examples/generalGraphAbsEccentricity3.generated
@@ -5,8 +5,8 @@ arangosh> db._query("RETURN GRAPH_ABSOLUTE_ECCENTRICITY("
 ........> "direction : 'outbound', weight : 'distance'})").toArray();
 [ 
   { 
-    "germanCity/Hamburg" : 1200, 
     "germanCity/Berlin" : 1200, 
+    "germanCity/Hamburg" : 1200, 
     "germanCity/Cologne" : 700 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphBetweenness3.generated b/Documentation/Examples/generalGraphBetweenness3.generated
index e443b4ba5e..f4019b95a4 100644
--- a/Documentation/Examples/generalGraphBetweenness3.generated
+++ b/Documentation/Examples/generalGraphBetweenness3.generated
@@ -4,10 +4,10 @@ arangosh> db._query("RETURN GRAPH_BETWEENNESS("
 ........> + "'routeplanner', {direction : 'outbound', weight : 'distance'})").toArray();
 [ 
   { 
-    "germanCity/Hamburg" : 0, 
+    "germanCity/Berlin" : 0, 
     "germanCity/Cologne" : 1, 
+    "germanCity/Hamburg" : 0, 
     "frenchCity/Paris" : 0, 
-    "frenchCity/Lyon" : 0, 
-    "germanCity/Berlin" : 0 
+    "frenchCity/Lyon" : 0 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphCloseness1.generated b/Documentation/Examples/generalGraphCloseness1.generated
index d7e2986c90..f01f9cd14a 100644
--- a/Documentation/Examples/generalGraphCloseness1.generated
+++ b/Documentation/Examples/generalGraphCloseness1.generated
@@ -4,8 +4,8 @@ arangosh> db._query("RETURN GRAPH_CLOSENESS('routeplanner')").toArray();
 [ 
   { 
     "germanCity/Berlin" : 1, 
-    "germanCity/Cologne" : 1, 
     "germanCity/Hamburg" : 1, 
+    "germanCity/Cologne" : 1, 
     "frenchCity/Paris" : 1, 
     "frenchCity/Lyon" : 1 
   } 
diff --git a/Documentation/Examples/generalGraphCommonNeighbors1.generated b/Documentation/Examples/generalGraphCommonNeighbors1.generated
index 16e3e1ffd7..a56445c286 100644
--- a/Documentation/Examples/generalGraphCommonNeighbors1.generated
+++ b/Documentation/Examples/generalGraphCommonNeighbors1.generated
@@ -10,21 +10,21 @@ arangosh> db._query("FOR e IN GRAPH_COMMON_NEIGHBORS("
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "987425115", 
+          "_rev" : "984785197", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "987621723", 
+          "_rev" : "984981805", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "988014939", 
+          "_rev" : "985440557", 
           "isCapital" : false, 
           "population" : 80000 
         } 
@@ -37,21 +37,21 @@ arangosh> db._query("FOR e IN GRAPH_COMMON_NEIGHBORS("
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "987425115", 
+          "_rev" : "984785197", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "987621723", 
+          "_rev" : "984981805", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "988014939", 
+          "_rev" : "985440557", 
           "isCapital" : false, 
           "population" : 80000 
         } 
diff --git a/Documentation/Examples/generalGraphCommonNeighbors2.generated b/Documentation/Examples/generalGraphCommonNeighbors2.generated
index 66484578da..7c5c75aba2 100644
--- a/Documentation/Examples/generalGraphCommonNeighbors2.generated
+++ b/Documentation/Examples/generalGraphCommonNeighbors2.generated
@@ -11,21 +11,21 @@ arangosh> db._query("FOR e IN GRAPH_COMMON_NEIGHBORS("
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "1076291931", 
+          "_rev" : "1074110765", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "1076881755", 
+          "_rev" : "1074700589", 
           "isCapital" : false, 
           "population" : 80000 
         }, 
         { 
           "_id" : "frenchCity/Paris", 
           "_key" : "Paris", 
-          "_rev" : "1077078363", 
+          "_rev" : "1074897197", 
           "isCapital" : true, 
           "population" : 4000000 
         } 
@@ -34,14 +34,14 @@ arangosh> db._query("FOR e IN GRAPH_COMMON_NEIGHBORS("
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "1076881755", 
+          "_rev" : "1074700589", 
           "isCapital" : false, 
           "population" : 80000 
         }, 
         { 
           "_id" : "frenchCity/Paris", 
           "_key" : "Paris", 
-          "_rev" : "1077078363", 
+          "_rev" : "1074897197", 
           "isCapital" : true, 
           "population" : 4000000 
         } 
@@ -50,7 +50,7 @@ arangosh> db._query("FOR e IN GRAPH_COMMON_NEIGHBORS("
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "1076881755", 
+          "_rev" : "1074700589", 
           "isCapital" : false, 
           "population" : 80000 
         } 
diff --git a/Documentation/Examples/generalGraphDistanceTo1.generated b/Documentation/Examples/generalGraphDistanceTo1.generated
index fcf5a4bc97..be3f62738c 100644
--- a/Documentation/Examples/generalGraphDistanceTo1.generated
+++ b/Documentation/Examples/generalGraphDistanceTo1.generated
@@ -24,13 +24,13 @@ arangosh> db._query("FOR e IN GRAPH_DISTANCE_TO("
   ], 
   [ 
     "frenchCity/Lyon", 
-    "germanCity/Berlin", 
-    1100 
+    "germanCity/Hamburg", 
+    1200 
   ], 
   [ 
     "frenchCity/Lyon", 
-    "germanCity/Hamburg", 
-    1200 
+    "germanCity/Berlin", 
+    1100 
   ], 
   [ 
     "frenchCity/Lyon", 
diff --git a/Documentation/Examples/generalGraphDropGraphKeep.generated b/Documentation/Examples/generalGraphDropGraphKeep.generated
index b2c7cf1fcc..0535d2c761 100644
--- a/Documentation/Examples/generalGraphDropGraphKeep.generated
+++ b/Documentation/Examples/generalGraphDropGraphKeep.generated
@@ -2,8 +2,8 @@ arangosh> var graph_module = require("org/arangodb/general-graph");
 arangosh> graph_module._drop("social");
 true
 arangosh> db._collection("female");
-[ArangoCollection 242870619, "female" (type document, status loaded)]
+[ArangoCollection 242262317, "female" (type document, status loaded)]
 arangosh> db._collection("male");
-[ArangoCollection 243001691, "male" (type document, status loaded)]
+[ArangoCollection 242393389, "male" (type document, status loaded)]
 arangosh> db._collection("relation");
-[ArangoCollection 243132763, "relation" (type edge, status loaded)]
+[ArangoCollection 242524461, "relation" (type edge, status loaded)]
diff --git a/Documentation/Examples/generalGraphEccentricity2.generated b/Documentation/Examples/generalGraphEccentricity2.generated
index c0047f70a4..1b41100f5e 100644
--- a/Documentation/Examples/generalGraphEccentricity2.generated
+++ b/Documentation/Examples/generalGraphEccentricity2.generated
@@ -4,9 +4,9 @@ arangosh> db._query("RETURN GRAPH_ECCENTRICITY('routeplanner', {weight : 'distan
 ........> ).toArray();
 [ 
   { 
-    "germanCity/Berlin" : 0.7083333333333335, 
-    "germanCity/Cologne" : 1, 
     "germanCity/Hamburg" : 0.7083333333333335, 
+    "germanCity/Cologne" : 1, 
+    "germanCity/Berlin" : 0.7083333333333335, 
     "frenchCity/Paris" : 0.7083333333333335, 
     "frenchCity/Lyon" : 0.7083333333333335 
   } 
diff --git a/Documentation/Examples/generalGraphEdgeCollectionRemove.generated b/Documentation/Examples/generalGraphEdgeCollectionRemove.generated
index 138495f579..62850485b8 100644
--- a/Documentation/Examples/generalGraphEdgeCollectionRemove.generated
+++ b/Documentation/Examples/generalGraphEdgeCollectionRemove.generated
@@ -4,7 +4,7 @@ arangosh> graph.relation.save("female/alice", "female/diana", {_key: "aliceAndDi
 { 
   "error" : false, 
   "_id" : "relation/aliceAndDiana", 
-  "_rev" : "563997019", 
+  "_rev" : "562012461", 
   "_key" : "aliceAndDiana" 
 }
 arangosh> db._exists("relation/aliceAndDiana")
diff --git a/Documentation/Examples/generalGraphEdgeCollectionReplace.generated b/Documentation/Examples/generalGraphEdgeCollectionReplace.generated
index 3face099f5..1f935712c9 100644
--- a/Documentation/Examples/generalGraphEdgeCollectionReplace.generated
+++ b/Documentation/Examples/generalGraphEdgeCollectionReplace.generated
@@ -4,13 +4,13 @@ arangosh> graph.relation.save("female/alice", "female/diana", {typo: "nose", _ke
 { 
   "error" : false, 
   "_id" : "relation/aliceAndDiana", 
-  "_rev" : "28567899", 
+  "_rev" : "28549421", 
   "_key" : "aliceAndDiana" 
 }
 arangosh> graph.relation.replace("relation/aliceAndDiana", {type: "knows"});
 { 
   "error" : false, 
   "_id" : "relation/aliceAndDiana", 
-  "_rev" : "28764507", 
+  "_rev" : "28746029", 
   "_key" : "aliceAndDiana" 
 }
diff --git a/Documentation/Examples/generalGraphEdgeCollectionSave1.generated b/Documentation/Examples/generalGraphEdgeCollectionSave1.generated
index 1084ee8b86..230de7e9bb 100644
--- a/Documentation/Examples/generalGraphEdgeCollectionSave1.generated
+++ b/Documentation/Examples/generalGraphEdgeCollectionSave1.generated
@@ -4,6 +4,6 @@ arangosh> graph.relation.save("male/bob", "female/alice", {type: "married", _key
 { 
   "error" : false, 
   "_id" : "relation/bobAndAlice", 
-  "_rev" : "1016326491", 
+  "_rev" : "1014145325", 
   "_key" : "bobAndAlice" 
 }
diff --git a/Documentation/Examples/generalGraphEdgeCollectionUpdate.generated b/Documentation/Examples/generalGraphEdgeCollectionUpdate.generated
index 0004a0a35b..32ac512fe7 100644
--- a/Documentation/Examples/generalGraphEdgeCollectionUpdate.generated
+++ b/Documentation/Examples/generalGraphEdgeCollectionUpdate.generated
@@ -4,13 +4,13 @@ arangosh> graph.relation.save("female/alice", "female/diana", {type: "knows", _k
 { 
   "error" : false, 
   "_id" : "relation/aliceAndDiana", 
-  "_rev" : "304605531", 
+  "_rev" : "300720429", 
   "_key" : "aliceAndDiana" 
 }
 arangosh> graph.relation.update("relation/aliceAndDiana", {type: "quarrelled", _key: "aliceAndDiana"});
 { 
   "error" : false, 
   "_id" : "relation/aliceAndDiana", 
-  "_rev" : "304802139", 
+  "_rev" : "300917037", 
   "_key" : "aliceAndDiana" 
 }
diff --git a/Documentation/Examples/generalGraphEdges1.generated b/Documentation/Examples/generalGraphEdges1.generated
index 92192d3de8..4654b9a35a 100644
--- a/Documentation/Examples/generalGraphEdges1.generated
+++ b/Documentation/Examples/generalGraphEdges1.generated
@@ -5,9 +5,9 @@ arangosh> db._query("FOR e IN GRAPH_EDGES("
 ........> ).toArray();
 [ 
   { 
-    "_id" : "internationalHighway/573958491", 
-    "_key" : "573958491", 
-    "_rev" : "573958491", 
+    "_id" : "internationalHighway/571973933", 
+    "_key" : "571973933", 
+    "_rev" : "571973933", 
     "_from" : "germanCity/Cologne", 
     "_to" : "frenchCity/Lyon", 
     "distance" : 700 
diff --git a/Documentation/Examples/generalGraphEdges2.generated b/Documentation/Examples/generalGraphEdges2.generated
index 71999084e0..b5974aeb83 100644
--- a/Documentation/Examples/generalGraphEdges2.generated
+++ b/Documentation/Examples/generalGraphEdges2.generated
@@ -5,49 +5,49 @@ arangosh> db._query("FOR e IN GRAPH_EDGES("
 ........> ).toArray();
 [ 
   { 
-    "_id" : "germanHighway/578611547", 
-    "_key" : "578611547", 
-    "_rev" : "578611547", 
+    "_id" : "germanHighway/576626989", 
+    "_key" : "576626989", 
+    "_rev" : "576626989", 
     "_from" : "germanCity/Hamburg", 
     "_to" : "germanCity/Cologne", 
     "distance" : 500 
   }, 
   { 
-    "_id" : "internationalHighway/580053339", 
-    "_key" : "580053339", 
-    "_rev" : "580053339", 
+    "_id" : "internationalHighway/578068781", 
+    "_key" : "578068781", 
+    "_rev" : "578068781", 
     "_from" : "germanCity/Cologne", 
     "_to" : "frenchCity/Lyon", 
     "distance" : 700 
   }, 
   { 
-    "_id" : "internationalHighway/580249947", 
-    "_key" : "580249947", 
-    "_rev" : "580249947", 
+    "_id" : "internationalHighway/578265389", 
+    "_key" : "578265389", 
+    "_rev" : "578265389", 
     "_from" : "germanCity/Cologne", 
     "_to" : "frenchCity/Paris", 
     "distance" : 550 
   }, 
   { 
-    "_id" : "internationalHighway/579660123", 
-    "_key" : "579660123", 
-    "_rev" : "579660123", 
+    "_id" : "internationalHighway/577675565", 
+    "_key" : "577675565", 
+    "_rev" : "577675565", 
     "_from" : "germanCity/Hamburg", 
     "_to" : "frenchCity/Paris", 
     "distance" : 900 
   }, 
   { 
-    "_id" : "frenchHighway/578939227", 
-    "_key" : "578939227", 
-    "_rev" : "578939227", 
+    "_id" : "frenchHighway/576954669", 
+    "_key" : "576954669", 
+    "_rev" : "576954669", 
     "_from" : "frenchCity/Paris", 
     "_to" : "frenchCity/Lyon", 
     "distance" : 550 
   }, 
   { 
-    "_id" : "internationalHighway/579856731", 
-    "_key" : "579856731", 
-    "_rev" : "579856731", 
+    "_id" : "internationalHighway/577872173", 
+    "_key" : "577872173", 
+    "_rev" : "577872173", 
     "_from" : "germanCity/Hamburg", 
     "_to" : "frenchCity/Lyon", 
     "distance" : 1300 
diff --git a/Documentation/Examples/generalGraphEdgesFiltered.generated b/Documentation/Examples/generalGraphEdgesFiltered.generated
index dd6cffad02..385d28b82d 100644
--- a/Documentation/Examples/generalGraphEdgesFiltered.generated
+++ b/Documentation/Examples/generalGraphEdgesFiltered.generated
@@ -5,7 +5,7 @@ arangosh> graph._edges({type: "married"}).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "96659803", 
+    "_rev" : "96641325", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -13,7 +13,7 @@ arangosh> graph._edges({type: "married"}).toArray();
   { 
     "_id" : "relation/charlyAndDiana", 
     "_key" : "charlyAndDiana", 
-    "_rev" : "97118555", 
+    "_rev" : "97100077", 
     "_from" : "male/charly", 
     "_to" : "female/diana", 
     "type" : "married" 
diff --git a/Documentation/Examples/generalGraphEdgesUnfiltered.generated b/Documentation/Examples/generalGraphEdgesUnfiltered.generated
index 3670756d8e..dc58dcd917 100644
--- a/Documentation/Examples/generalGraphEdgesUnfiltered.generated
+++ b/Documentation/Examples/generalGraphEdgesUnfiltered.generated
@@ -5,7 +5,7 @@ arangosh> graph._edges().toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "665905499", 
+    "_rev" : "663789869", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -13,7 +13,7 @@ arangosh> graph._edges().toArray();
   { 
     "_id" : "relation/aliceAndCharly", 
     "_key" : "aliceAndCharly", 
-    "_rev" : "666167643", 
+    "_rev" : "664052013", 
     "_from" : "female/alice", 
     "_to" : "male/charly", 
     "type" : "friend" 
@@ -21,7 +21,7 @@ arangosh> graph._edges().toArray();
   { 
     "_id" : "relation/bobAndDiana", 
     "_key" : "bobAndDiana", 
-    "_rev" : "666560859", 
+    "_rev" : "664445229", 
     "_from" : "male/bob", 
     "_to" : "female/diana", 
     "type" : "friend" 
@@ -29,7 +29,7 @@ arangosh> graph._edges().toArray();
   { 
     "_id" : "relation/charlyAndDiana", 
     "_key" : "charlyAndDiana", 
-    "_rev" : "666364251", 
+    "_rev" : "664248621", 
     "_from" : "male/charly", 
     "_to" : "female/diana", 
     "type" : "married" 
diff --git a/Documentation/Examples/generalGraphFluentAQLEdgesFilteredMultiple.generated b/Documentation/Examples/generalGraphFluentAQLEdgesFilteredMultiple.generated
index 89952640c9..6c8f53d0d8 100644
--- a/Documentation/Examples/generalGraphFluentAQLEdgesFilteredMultiple.generated
+++ b/Documentation/Examples/generalGraphFluentAQLEdgesFilteredMultiple.generated
@@ -6,7 +6,7 @@ arangosh> query.edges([{type: "married"}, {type: "friend"}]).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "1006430555", 
+    "_rev" : "1004249389", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -14,7 +14,7 @@ arangosh> query.edges([{type: "married"}, {type: "friend"}]).toArray();
   { 
     "_id" : "relation/aliceAndCharly", 
     "_key" : "aliceAndCharly", 
-    "_rev" : "1006692699", 
+    "_rev" : "1004511533", 
     "_from" : "female/alice", 
     "_to" : "male/charly", 
     "type" : "friend" 
@@ -22,7 +22,7 @@ arangosh> query.edges([{type: "married"}, {type: "friend"}]).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "1006430555", 
+    "_rev" : "1004249389", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -30,7 +30,7 @@ arangosh> query.edges([{type: "married"}, {type: "friend"}]).toArray();
   { 
     "_id" : "relation/bobAndDiana", 
     "_key" : "bobAndDiana", 
-    "_rev" : "1007085915", 
+    "_rev" : "1004904749", 
     "_from" : "male/bob", 
     "_to" : "female/diana", 
     "type" : "friend" 
diff --git a/Documentation/Examples/generalGraphFluentAQLEdgesFilteredSingle.generated b/Documentation/Examples/generalGraphFluentAQLEdgesFilteredSingle.generated
index f4eb0cacac..348b29f99b 100644
--- a/Documentation/Examples/generalGraphFluentAQLEdgesFilteredSingle.generated
+++ b/Documentation/Examples/generalGraphFluentAQLEdgesFilteredSingle.generated
@@ -6,7 +6,7 @@ arangosh> query.edges({type: "married"}).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "704506203", 
+    "_rev" : "702390573", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -14,7 +14,7 @@ arangosh> query.edges({type: "married"}).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "704506203", 
+    "_rev" : "702390573", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
diff --git a/Documentation/Examples/generalGraphFluentAQLEdgesUnfiltered.generated b/Documentation/Examples/generalGraphFluentAQLEdgesUnfiltered.generated
index c541788b6e..717702db9a 100644
--- a/Documentation/Examples/generalGraphFluentAQLEdgesUnfiltered.generated
+++ b/Documentation/Examples/generalGraphFluentAQLEdgesUnfiltered.generated
@@ -6,7 +6,7 @@ arangosh> query.edges().toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "293857627", 
+    "_rev" : "290038061", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -14,7 +14,7 @@ arangosh> query.edges().toArray();
   { 
     "_id" : "relation/aliceAndCharly", 
     "_key" : "aliceAndCharly", 
-    "_rev" : "294119771", 
+    "_rev" : "290300205", 
     "_from" : "female/alice", 
     "_to" : "male/charly", 
     "type" : "friend" 
@@ -22,7 +22,7 @@ arangosh> query.edges().toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "293857627", 
+    "_rev" : "290038061", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -30,7 +30,7 @@ arangosh> query.edges().toArray();
   { 
     "_id" : "relation/bobAndDiana", 
     "_key" : "bobAndDiana", 
-    "_rev" : "294512987", 
+    "_rev" : "290693421", 
     "_from" : "male/bob", 
     "_to" : "female/diana", 
     "type" : "friend" 
diff --git a/Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredMultiple.generated b/Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredMultiple.generated
index 35168df1b3..ff4aaf45a8 100644
--- a/Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredMultiple.generated
+++ b/Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredMultiple.generated
@@ -6,49 +6,49 @@ arangosh> query.fromVertices([{name: "Alice"}, {name: "Charly"}]).toArray();
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "1011411291", 
+    "_rev" : "1009230125", 
     "name" : "Diana" 
   }, 
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "1010690395", 
+    "_rev" : "1008509229", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "1011018075", 
+    "_rev" : "1008836909", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "1011214683", 
+    "_rev" : "1009033517", 
     "name" : "Charly" 
   }, 
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "1011411291", 
+    "_rev" : "1009230125", 
     "name" : "Diana" 
   }, 
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "1010690395", 
+    "_rev" : "1008509229", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "1011018075", 
+    "_rev" : "1008836909", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "1011214683", 
+    "_rev" : "1009033517", 
     "name" : "Charly" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredSingle.generated b/Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredSingle.generated
index b14bccd2e4..ccc6746338 100644
--- a/Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredSingle.generated
+++ b/Documentation/Examples/generalGraphFluentAQLFromVerticesFilteredSingle.generated
@@ -6,7 +6,7 @@ arangosh> query.fromVertices({name: "Alice"}).toArray();
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "966191451", 
+    "_rev" : "963551533", 
     "name" : "Alice" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLFromVerticesUnfiltered.generated b/Documentation/Examples/generalGraphFluentAQLFromVerticesUnfiltered.generated
index 92281ed40b..8be6bdfe89 100644
--- a/Documentation/Examples/generalGraphFluentAQLFromVerticesUnfiltered.generated
+++ b/Documentation/Examples/generalGraphFluentAQLFromVerticesUnfiltered.generated
@@ -6,13 +6,13 @@ arangosh> query.fromVertices().toArray();
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "209709403", 
+    "_rev" : "209232173", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "210233691", 
+    "_rev" : "209756461", 
     "name" : "Charly" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLInEdgesFilteredMultiple.generated b/Documentation/Examples/generalGraphFluentAQLInEdgesFilteredMultiple.generated
index 1d2c719be7..789f0d8034 100644
--- a/Documentation/Examples/generalGraphFluentAQLInEdgesFilteredMultiple.generated
+++ b/Documentation/Examples/generalGraphFluentAQLInEdgesFilteredMultiple.generated
@@ -6,7 +6,7 @@ arangosh> query.inEdges([{type: "married"}, {type: "friend"}]).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "220653915", 
+    "_rev" : "220111149", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
diff --git a/Documentation/Examples/generalGraphFluentAQLInEdgesFilteredSingle.generated b/Documentation/Examples/generalGraphFluentAQLInEdgesFilteredSingle.generated
index 456a4e8239..f67e2e94fe 100644
--- a/Documentation/Examples/generalGraphFluentAQLInEdgesFilteredSingle.generated
+++ b/Documentation/Examples/generalGraphFluentAQLInEdgesFilteredSingle.generated
@@ -6,7 +6,7 @@ arangosh> query.inEdges({type: "married"}).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "67955035", 
+    "_rev" : "67936557", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
diff --git a/Documentation/Examples/generalGraphFluentAQLInEdgesUnfiltered.generated b/Documentation/Examples/generalGraphFluentAQLInEdgesUnfiltered.generated
index 5703a47730..2fec8621a5 100644
--- a/Documentation/Examples/generalGraphFluentAQLInEdgesUnfiltered.generated
+++ b/Documentation/Examples/generalGraphFluentAQLInEdgesUnfiltered.generated
@@ -6,7 +6,7 @@ arangosh> query.inEdges().toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "248047963", 
+    "_rev" : "247439661", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
diff --git a/Documentation/Examples/generalGraphFluentAQLNeighborsFilteredSingle.generated b/Documentation/Examples/generalGraphFluentAQLNeighborsFilteredSingle.generated
index f47adbd45f..782dc4a058 100644
--- a/Documentation/Examples/generalGraphFluentAQLNeighborsFilteredSingle.generated
+++ b/Documentation/Examples/generalGraphFluentAQLNeighborsFilteredSingle.generated
@@ -6,7 +6,7 @@ arangosh> query.neighbors({name: "Bob"}).toArray();
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "153086299", 
+    "_rev" : "153002285", 
     "name" : "Bob" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLNeighborsUnfiltered.generated b/Documentation/Examples/generalGraphFluentAQLNeighborsUnfiltered.generated
index 4031e8bc1c..7f6c684327 100644
--- a/Documentation/Examples/generalGraphFluentAQLNeighborsUnfiltered.generated
+++ b/Documentation/Examples/generalGraphFluentAQLNeighborsUnfiltered.generated
@@ -6,13 +6,13 @@ arangosh> query.neighbors().toArray();
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "530770267", 
+    "_rev" : "528785709", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "530966875", 
+    "_rev" : "528982317", 
     "name" : "Charly" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLNext.generated b/Documentation/Examples/generalGraphFluentAQLNext.generated
index e1e4a17a9b..1a6da82662 100644
--- a/Documentation/Examples/generalGraphFluentAQLNext.generated
+++ b/Documentation/Examples/generalGraphFluentAQLNext.generated
@@ -5,27 +5,27 @@ arangosh> query.next();
 { 
   "_id" : "female/diana", 
   "_key" : "diana", 
-  "_rev" : "1031268699", 
+  "_rev" : "1029087533", 
   "name" : "Diana" 
 }
 arangosh> query.next();
 { 
   "_id" : "female/alice", 
   "_key" : "alice", 
-  "_rev" : "1030547803", 
+  "_rev" : "1028366637", 
   "name" : "Alice" 
 }
 arangosh> query.next();
 { 
   "_id" : "male/bob", 
   "_key" : "bob", 
-  "_rev" : "1030875483", 
+  "_rev" : "1028694317", 
   "name" : "Bob" 
 }
 arangosh> query.next();
 { 
   "_id" : "male/charly", 
   "_key" : "charly", 
-  "_rev" : "1031072091", 
+  "_rev" : "1028890925", 
   "name" : "Charly" 
 }
diff --git a/Documentation/Examples/generalGraphFluentAQLNextRecreate.generated b/Documentation/Examples/generalGraphFluentAQLNextRecreate.generated
index 1979784899..015fee3855 100644
--- a/Documentation/Examples/generalGraphFluentAQLNextRecreate.generated
+++ b/Documentation/Examples/generalGraphFluentAQLNextRecreate.generated
@@ -5,7 +5,7 @@ arangosh> query.next();
 { 
   "_id" : "female/diana", 
   "_key" : "diana", 
-  "_rev" : "636348763", 
+  "_rev" : "634233133", 
   "name" : "Diana" 
 }
 arangosh> query.edges();
@@ -16,7 +16,7 @@ arangosh> query.next();
 { 
   "_id" : "relation/charlyAndDiana", 
   "_key" : "charlyAndDiana", 
-  "_rev" : "637135195", 
+  "_rev" : "635019565", 
   "_from" : "male/charly", 
   "_to" : "female/diana", 
   "type" : "married" 
diff --git a/Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredMultiple.generated b/Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredMultiple.generated
index 9836963976..ab3a759676 100644
--- a/Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredMultiple.generated
+++ b/Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredMultiple.generated
@@ -6,7 +6,7 @@ arangosh> query.outEdges([{type: "married"}, {type: "friend"}]).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "795666779", 
+    "_rev" : "793026861", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -14,7 +14,7 @@ arangosh> query.outEdges([{type: "married"}, {type: "friend"}]).toArray();
   { 
     "_id" : "relation/aliceAndCharly", 
     "_key" : "aliceAndCharly", 
-    "_rev" : "795928923", 
+    "_rev" : "793289005", 
     "_from" : "female/alice", 
     "_to" : "male/charly", 
     "type" : "friend" 
@@ -22,7 +22,7 @@ arangosh> query.outEdges([{type: "married"}, {type: "friend"}]).toArray();
   { 
     "_id" : "relation/bobAndDiana", 
     "_key" : "bobAndDiana", 
-    "_rev" : "796322139", 
+    "_rev" : "793682221", 
     "_from" : "male/bob", 
     "_to" : "female/diana", 
     "type" : "friend" 
diff --git a/Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredSingle.generated b/Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredSingle.generated
index b0a61d5f99..263d053ed2 100644
--- a/Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredSingle.generated
+++ b/Documentation/Examples/generalGraphFluentAQLOutEdgesFilteredSingle.generated
@@ -6,7 +6,7 @@ arangosh> query.outEdges({type: "married"}).toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "559081819", 
+    "_rev" : "557031725", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
diff --git a/Documentation/Examples/generalGraphFluentAQLOutEdgesUnfiltered.generated b/Documentation/Examples/generalGraphFluentAQLOutEdgesUnfiltered.generated
index af4182a832..7c3a727761 100644
--- a/Documentation/Examples/generalGraphFluentAQLOutEdgesUnfiltered.generated
+++ b/Documentation/Examples/generalGraphFluentAQLOutEdgesUnfiltered.generated
@@ -6,7 +6,7 @@ arangosh> query.outEdges().toArray();
   { 
     "_id" : "relation/aliceAndBob", 
     "_key" : "aliceAndBob", 
-    "_rev" : "279439707", 
+    "_rev" : "275554605", 
     "_from" : "female/alice", 
     "_to" : "male/bob", 
     "type" : "married" 
@@ -14,7 +14,7 @@ arangosh> query.outEdges().toArray();
   { 
     "_id" : "relation/aliceAndCharly", 
     "_key" : "aliceAndCharly", 
-    "_rev" : "279701851", 
+    "_rev" : "275816749", 
     "_from" : "female/alice", 
     "_to" : "male/charly", 
     "type" : "friend" 
@@ -22,7 +22,7 @@ arangosh> query.outEdges().toArray();
   { 
     "_id" : "relation/bobAndDiana", 
     "_key" : "bobAndDiana", 
-    "_rev" : "280095067", 
+    "_rev" : "276209965", 
     "_from" : "male/bob", 
     "_to" : "female/diana", 
     "type" : "friend" 
diff --git a/Documentation/Examples/generalGraphFluentAQLPathNeighbors.generated b/Documentation/Examples/generalGraphFluentAQLPathNeighbors.generated
index 517516a0c8..0ce7203ec3 100644
--- a/Documentation/Examples/generalGraphFluentAQLPathNeighbors.generated
+++ b/Documentation/Examples/generalGraphFluentAQLPathNeighbors.generated
@@ -7,7 +7,7 @@ arangosh> query.neighbors().path().toArray();
     { 
       "_id" : "female/alice", 
       "_key" : "alice", 
-      "_rev" : "57076059", 
+      "_rev" : "57057581", 
       "name" : "Alice" 
     }, 
     { 
@@ -15,7 +15,7 @@ arangosh> query.neighbors().path().toArray();
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "58124635", 
+          "_rev" : "58106157", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -25,13 +25,13 @@ arangosh> query.neighbors().path().toArray();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "57076059", 
+          "_rev" : "57057581", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "57403739", 
+          "_rev" : "57385261", 
           "name" : "Bob" 
         } 
       ] 
@@ -41,7 +41,7 @@ arangosh> query.neighbors().path().toArray();
     { 
       "_id" : "female/alice", 
       "_key" : "alice", 
-      "_rev" : "57076059", 
+      "_rev" : "57057581", 
       "name" : "Alice" 
     }, 
     { 
@@ -49,7 +49,7 @@ arangosh> query.neighbors().path().toArray();
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "58386779", 
+          "_rev" : "58368301", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -59,13 +59,13 @@ arangosh> query.neighbors().path().toArray();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "57076059", 
+          "_rev" : "57057581", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "57600347", 
+          "_rev" : "57581869", 
           "name" : "Charly" 
         } 
       ] 
diff --git a/Documentation/Examples/generalGraphFluentAQLPathSimple.generated b/Documentation/Examples/generalGraphFluentAQLPathSimple.generated
index 7c03694ef6..447514db64 100644
--- a/Documentation/Examples/generalGraphFluentAQLPathSimple.generated
+++ b/Documentation/Examples/generalGraphFluentAQLPathSimple.generated
@@ -7,13 +7,13 @@ arangosh> query.outEdges().toVertices().path().toArray();
     { 
       "_id" : "female/alice", 
       "_key" : "alice", 
-      "_rev" : "314567003", 
+      "_rev" : "310419757", 
       "name" : "Alice" 
     }, 
     { 
       "_id" : "relation/aliceAndBob", 
       "_key" : "aliceAndBob", 
-      "_rev" : "315615579", 
+      "_rev" : "311468333", 
       "_from" : "female/alice", 
       "_to" : "male/bob", 
       "type" : "married" 
@@ -21,7 +21,7 @@ arangosh> query.outEdges().toVertices().path().toArray();
     { 
       "_id" : "male/bob", 
       "_key" : "bob", 
-      "_rev" : "314894683", 
+      "_rev" : "310747437", 
       "name" : "Bob" 
     } 
   ], 
@@ -29,13 +29,13 @@ arangosh> query.outEdges().toVertices().path().toArray();
     { 
       "_id" : "female/alice", 
       "_key" : "alice", 
-      "_rev" : "314567003", 
+      "_rev" : "310419757", 
       "name" : "Alice" 
     }, 
     { 
       "_id" : "relation/aliceAndCharly", 
       "_key" : "aliceAndCharly", 
-      "_rev" : "315877723", 
+      "_rev" : "311730477", 
       "_from" : "female/alice", 
       "_to" : "male/charly", 
       "type" : "friend" 
@@ -43,7 +43,7 @@ arangosh> query.outEdges().toVertices().path().toArray();
     { 
       "_id" : "male/charly", 
       "_key" : "charly", 
-      "_rev" : "315091291", 
+      "_rev" : "310944045", 
       "name" : "Charly" 
     } 
   ] 
diff --git a/Documentation/Examples/generalGraphFluentAQLRestricted.generated b/Documentation/Examples/generalGraphFluentAQLRestricted.generated
index 2ca81db6a0..832a458dac 100644
--- a/Documentation/Examples/generalGraphFluentAQLRestricted.generated
+++ b/Documentation/Examples/generalGraphFluentAQLRestricted.generated
@@ -6,13 +6,13 @@ arangosh> query.edges().vertices().restrict("female").toArray();
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "514517339", 
+    "_rev" : "512598317", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "514517339", 
+    "_rev" : "512598317", 
     "name" : "Alice" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLToArray.generated b/Documentation/Examples/generalGraphFluentAQLToArray.generated
index a26204c846..f1a1b876ea 100644
--- a/Documentation/Examples/generalGraphFluentAQLToArray.generated
+++ b/Documentation/Examples/generalGraphFluentAQLToArray.generated
@@ -6,25 +6,25 @@ arangosh> query.toArray();
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "511502683", 
+    "_rev" : "509583661", 
     "name" : "Diana" 
   }, 
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "510781787", 
+    "_rev" : "508862765", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "511109467", 
+    "_rev" : "509190445", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "511306075", 
+    "_rev" : "509387053", 
     "name" : "Charly" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLToVerticesFilteredMultiple.generated b/Documentation/Examples/generalGraphFluentAQLToVerticesFilteredMultiple.generated
index 1b9dd4b997..9d9a28960d 100644
--- a/Documentation/Examples/generalGraphFluentAQLToVerticesFilteredMultiple.generated
+++ b/Documentation/Examples/generalGraphFluentAQLToVerticesFilteredMultiple.generated
@@ -6,49 +6,49 @@ arangosh> query.toVertices([{name: "Bob"}, {name: "Diana"}]).toArray();
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "32434523", 
+    "_rev" : "32481581", 
     "name" : "Diana" 
   }, 
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "31713627", 
+    "_rev" : "31760685", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "32041307", 
+    "_rev" : "32088365", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "32237915", 
+    "_rev" : "32284973", 
     "name" : "Charly" 
   }, 
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "32434523", 
+    "_rev" : "32481581", 
     "name" : "Diana" 
   }, 
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "31713627", 
+    "_rev" : "31760685", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "32041307", 
+    "_rev" : "32088365", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "32237915", 
+    "_rev" : "32284973", 
     "name" : "Charly" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLToVerticesFilteredSingle.generated b/Documentation/Examples/generalGraphFluentAQLToVerticesFilteredSingle.generated
index 3e919b944b..c17befe361 100644
--- a/Documentation/Examples/generalGraphFluentAQLToVerticesFilteredSingle.generated
+++ b/Documentation/Examples/generalGraphFluentAQLToVerticesFilteredSingle.generated
@@ -6,7 +6,7 @@ arangosh> query.toVertices({name: "Bob"}).toArray();
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "678881627", 
+    "_rev" : "676831533", 
     "name" : "Bob" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLToVerticesUnfiltered.generated b/Documentation/Examples/generalGraphFluentAQLToVerticesUnfiltered.generated
index 094d5e31d6..0b8866cb85 100644
--- a/Documentation/Examples/generalGraphFluentAQLToVerticesUnfiltered.generated
+++ b/Documentation/Examples/generalGraphFluentAQLToVerticesUnfiltered.generated
@@ -6,13 +6,13 @@ arangosh> query.toVertices().toArray();
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "137357659", 
+    "_rev" : "137273645", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "137750875", 
+    "_rev" : "137666861", 
     "name" : "Diana" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLUnfilteredEdges.generated b/Documentation/Examples/generalGraphFluentAQLUnfilteredEdges.generated
index d64f35c53f..7609008965 100644
--- a/Documentation/Examples/generalGraphFluentAQLUnfilteredEdges.generated
+++ b/Documentation/Examples/generalGraphFluentAQLUnfilteredEdges.generated
@@ -6,7 +6,7 @@ arangosh> query.toVertices().outEdges().toArray();
   { 
     "_id" : "relation/bobAndDiana", 
     "_key" : "bobAndDiana", 
-    "_rev" : "521529691", 
+    "_rev" : "519610669", 
     "_from" : "male/bob", 
     "_to" : "female/diana", 
     "type" : "friend" 
diff --git a/Documentation/Examples/generalGraphFluentAQLUnfilteredVertices.generated b/Documentation/Examples/generalGraphFluentAQLUnfilteredVertices.generated
index 5c3c2b1ca4..51526470cd 100644
--- a/Documentation/Examples/generalGraphFluentAQLUnfilteredVertices.generated
+++ b/Documentation/Examples/generalGraphFluentAQLUnfilteredVertices.generated
@@ -6,13 +6,13 @@ arangosh> query.toVertices().toArray();
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "1000335707", 
+    "_rev" : "998154541", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "1000728923", 
+    "_rev" : "998547757", 
     "name" : "Diana" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLUnrestricted.generated b/Documentation/Examples/generalGraphFluentAQLUnrestricted.generated
index 10e5cabe74..a9a6d91474 100644
--- a/Documentation/Examples/generalGraphFluentAQLUnrestricted.generated
+++ b/Documentation/Examples/generalGraphFluentAQLUnrestricted.generated
@@ -6,25 +6,25 @@ arangosh> query.edges().vertices().toArray();
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "1064429915", 
+    "_rev" : "1062183213", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "1064757595", 
+    "_rev" : "1062510893", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "1064429915", 
+    "_rev" : "1062183213", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "1064954203", 
+    "_rev" : "1062707501", 
     "name" : "Charly" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLVerticesFilteredSingle.generated b/Documentation/Examples/generalGraphFluentAQLVerticesFilteredSingle.generated
index 8ba7d41231..6bf8a29184 100644
--- a/Documentation/Examples/generalGraphFluentAQLVerticesFilteredSingle.generated
+++ b/Documentation/Examples/generalGraphFluentAQLVerticesFilteredSingle.generated
@@ -6,7 +6,7 @@ arangosh> query.vertices({name: "Alice"}).toArray();
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "507046235", 
+    "_rev" : "505127213", 
     "name" : "Alice" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphFluentAQLVerticesUnfiltered.generated b/Documentation/Examples/generalGraphFluentAQLVerticesUnfiltered.generated
index aadae7dcc2..206e39d354 100644
--- a/Documentation/Examples/generalGraphFluentAQLVerticesUnfiltered.generated
+++ b/Documentation/Examples/generalGraphFluentAQLVerticesUnfiltered.generated
@@ -6,25 +6,25 @@ arangosh> query.vertices().toArray();
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "654895451", 
+    "_rev" : "652779821", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "655223131", 
+    "_rev" : "653107501", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "655616347", 
+    "_rev" : "653500717", 
     "name" : "Diana" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "655419739", 
+    "_rev" : "653304109", 
     "name" : "Charly" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphGetFromVertex.generated b/Documentation/Examples/generalGraphGetFromVertex.generated
index 9aa76bf5eb..962c178ab8 100644
--- a/Documentation/Examples/generalGraphGetFromVertex.generated
+++ b/Documentation/Examples/generalGraphGetFromVertex.generated
@@ -4,6 +4,6 @@ arangosh> graph._fromVertex("relation/aliceAndBob")
 { 
   "name" : "Alice", 
   "_id" : "female/alice", 
-  "_rev" : "554166619", 
+  "_rev" : "552182061", 
   "_key" : "alice" 
 }
diff --git a/Documentation/Examples/generalGraphGetToVertex.generated b/Documentation/Examples/generalGraphGetToVertex.generated
index c25fe56519..6ab5a84332 100644
--- a/Documentation/Examples/generalGraphGetToVertex.generated
+++ b/Documentation/Examples/generalGraphGetToVertex.generated
@@ -4,6 +4,6 @@ arangosh> graph._toVertex("relation/aliceAndBob")
 { 
   "name" : "Bob", 
   "_id" : "male/bob", 
-  "_rev" : "40954203", 
+  "_rev" : "41001261", 
   "_key" : "bob" 
 }
diff --git a/Documentation/Examples/generalGraphModuleAbsBetweenness3.generated b/Documentation/Examples/generalGraphModuleAbsBetweenness3.generated
index a5967476f9..b448e1e9af 100644
--- a/Documentation/Examples/generalGraphModuleAbsBetweenness3.generated
+++ b/Documentation/Examples/generalGraphModuleAbsBetweenness3.generated
@@ -5,8 +5,8 @@ arangosh> graph._absoluteBetweenness({direction : 'outbound', weight : 'distance
   { 
     "germanCity/Hamburg" : 0, 
     "germanCity/Cologne" : 1, 
-    "frenchCity/Paris" : 0, 
     "frenchCity/Lyon" : 0, 
+    "frenchCity/Paris" : 0, 
     "germanCity/Berlin" : 0 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphModuleAbsCloseness1.generated b/Documentation/Examples/generalGraphModuleAbsCloseness1.generated
index 23e565a137..33176ce1ec 100644
--- a/Documentation/Examples/generalGraphModuleAbsCloseness1.generated
+++ b/Documentation/Examples/generalGraphModuleAbsCloseness1.generated
@@ -3,9 +3,9 @@ arangosh> var graph = examples.loadGraph("routeplanner");
 arangosh> graph._absoluteCloseness({});
 [ 
   { 
-    "germanCity/Berlin" : 4, 
     "germanCity/Hamburg" : 4, 
     "germanCity/Cologne" : 4, 
+    "germanCity/Berlin" : 4, 
     "frenchCity/Paris" : 4, 
     "frenchCity/Lyon" : 4 
   } 
diff --git a/Documentation/Examples/generalGraphModuleAbsCloseness2.generated b/Documentation/Examples/generalGraphModuleAbsCloseness2.generated
index e3cb4c7ae0..4ffb0f24fe 100644
--- a/Documentation/Examples/generalGraphModuleAbsCloseness2.generated
+++ b/Documentation/Examples/generalGraphModuleAbsCloseness2.generated
@@ -3,9 +3,9 @@ arangosh> var graph = examples.loadGraph("routeplanner");
 arangosh> graph._absoluteCloseness({}, {weight : 'distance'});
 [ 
   { 
+    "germanCity/Berlin" : 3550, 
     "germanCity/Hamburg" : 3000, 
     "germanCity/Cologne" : 2600, 
-    "germanCity/Berlin" : 3550, 
     "frenchCity/Paris" : 3200, 
     "frenchCity/Lyon" : 3550 
   } 
diff --git a/Documentation/Examples/generalGraphModuleAbsCloseness3.generated b/Documentation/Examples/generalGraphModuleAbsCloseness3.generated
index 6ebda666bf..3e21a0ab84 100644
--- a/Documentation/Examples/generalGraphModuleAbsCloseness3.generated
+++ b/Documentation/Examples/generalGraphModuleAbsCloseness3.generated
@@ -4,8 +4,8 @@ arangosh> graph._absoluteCloseness({}, {startVertexCollectionRestriction : 'germ
 ........> direction : 'outbound', weight : 'distance'});
 [ 
   { 
-    "germanCity/Berlin" : 3550, 
     "germanCity/Hamburg" : 2600, 
+    "germanCity/Berlin" : 3550, 
     "germanCity/Cologne" : 1250 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphModuleAbsEccentricity1.generated b/Documentation/Examples/generalGraphModuleAbsEccentricity1.generated
index 0678bdaeb7..6f09a0f069 100644
--- a/Documentation/Examples/generalGraphModuleAbsEccentricity1.generated
+++ b/Documentation/Examples/generalGraphModuleAbsEccentricity1.generated
@@ -5,9 +5,9 @@ arangosh> db._query("RETURN GRAPH_ABSOLUTE_ECCENTRICITY("
 ........> ).toArray();
 [ 
   { 
-    "germanCity/Hamburg" : 1, 
-    "germanCity/Cologne" : 1, 
     "germanCity/Berlin" : 1, 
+    "germanCity/Cologne" : 1, 
+    "germanCity/Hamburg" : 1, 
     "frenchCity/Paris" : 1, 
     "frenchCity/Lyon" : 1 
   } 
diff --git a/Documentation/Examples/generalGraphModuleAbsEccentricity3.generated b/Documentation/Examples/generalGraphModuleAbsEccentricity3.generated
index d545e4274c..f69b6616c3 100644
--- a/Documentation/Examples/generalGraphModuleAbsEccentricity3.generated
+++ b/Documentation/Examples/generalGraphModuleAbsEccentricity3.generated
@@ -4,8 +4,8 @@ arangosh> graph._absoluteEccentricity({}, {startVertexCollectionRestriction : 'g
 ........> direction : 'outbound', weight : 'distance'});
 [ 
   { 
-    "germanCity/Hamburg" : 1200, 
     "germanCity/Berlin" : 1200, 
+    "germanCity/Hamburg" : 1200, 
     "germanCity/Cologne" : 700 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphModuleBetweenness1.generated b/Documentation/Examples/generalGraphModuleBetweenness1.generated
index 1b61a70a1c..e06e192fde 100644
--- a/Documentation/Examples/generalGraphModuleBetweenness1.generated
+++ b/Documentation/Examples/generalGraphModuleBetweenness1.generated
@@ -6,7 +6,7 @@ arangosh> graph._betweenness();
     "germanCity/Berlin" : null, 
     "germanCity/Cologne" : null, 
     "germanCity/Hamburg" : null, 
-    "frenchCity/Paris" : null, 
-    "frenchCity/Lyon" : null 
+    "frenchCity/Lyon" : null, 
+    "frenchCity/Paris" : null 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphModuleBetweenness2.generated b/Documentation/Examples/generalGraphModuleBetweenness2.generated
index 1fc9eab1bb..34c432fcd3 100644
--- a/Documentation/Examples/generalGraphModuleBetweenness2.generated
+++ b/Documentation/Examples/generalGraphModuleBetweenness2.generated
@@ -6,7 +6,7 @@ arangosh> graph._betweenness({weight : 'distance'});
     "germanCity/Hamburg" : 0, 
     "germanCity/Cologne" : 1, 
     "germanCity/Berlin" : 0, 
-    "frenchCity/Paris" : 0, 
-    "frenchCity/Lyon" : 0 
+    "frenchCity/Lyon" : 0, 
+    "frenchCity/Paris" : 0 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphModuleBetweenness3.generated b/Documentation/Examples/generalGraphModuleBetweenness3.generated
index d0e9feb2ca..072104e456 100644
--- a/Documentation/Examples/generalGraphModuleBetweenness3.generated
+++ b/Documentation/Examples/generalGraphModuleBetweenness3.generated
@@ -4,8 +4,8 @@ arangosh> graph._betweenness({direction : 'outbound', weight : 'distance'});
 [ 
   { 
     "germanCity/Berlin" : 0, 
-    "germanCity/Hamburg" : 0, 
     "germanCity/Cologne" : 1, 
+    "germanCity/Hamburg" : 0, 
     "frenchCity/Lyon" : 0, 
     "frenchCity/Paris" : 0 
   } 
diff --git a/Documentation/Examples/generalGraphModuleCloseness1.generated b/Documentation/Examples/generalGraphModuleCloseness1.generated
index a694fbfbb7..93079ab8da 100644
--- a/Documentation/Examples/generalGraphModuleCloseness1.generated
+++ b/Documentation/Examples/generalGraphModuleCloseness1.generated
@@ -4,8 +4,8 @@ arangosh> graph._closeness();
 [ 
   { 
     "germanCity/Berlin" : 1, 
-    "germanCity/Cologne" : 1, 
     "germanCity/Hamburg" : 1, 
+    "germanCity/Cologne" : 1, 
     "frenchCity/Paris" : 1, 
     "frenchCity/Lyon" : 1 
   } 
diff --git a/Documentation/Examples/generalGraphModuleCloseness2.generated b/Documentation/Examples/generalGraphModuleCloseness2.generated
index edba79aaa9..789fe757e5 100644
--- a/Documentation/Examples/generalGraphModuleCloseness2.generated
+++ b/Documentation/Examples/generalGraphModuleCloseness2.generated
@@ -3,9 +3,9 @@ arangosh> var graph = examples.loadGraph("routeplanner");
 arangosh> graph._closeness({weight : 'distance'});
 [ 
   { 
-    "germanCity/Hamburg" : 0.8666666666666666, 
-    "germanCity/Cologne" : 1, 
     "germanCity/Berlin" : 0.7323943661971831, 
+    "germanCity/Cologne" : 1, 
+    "germanCity/Hamburg" : 0.8666666666666666, 
     "frenchCity/Paris" : 0.8125, 
     "frenchCity/Lyon" : 0.7323943661971831 
   } 
diff --git a/Documentation/Examples/generalGraphModuleCommonNeighbors1.generated b/Documentation/Examples/generalGraphModuleCommonNeighbors1.generated
index 183876a2ae..74a9b81ee8 100644
--- a/Documentation/Examples/generalGraphModuleCommonNeighbors1.generated
+++ b/Documentation/Examples/generalGraphModuleCommonNeighbors1.generated
@@ -8,21 +8,21 @@ arangosh> graph._commonNeighbors({isCapital : true}, {isCapital : true});
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "948365659", 
+          "_rev" : "945791277", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "948562267", 
+          "_rev" : "945987885", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "948955483", 
+          "_rev" : "946381101", 
           "isCapital" : false, 
           "population" : 80000 
         } 
@@ -35,21 +35,21 @@ arangosh> graph._commonNeighbors({isCapital : true}, {isCapital : true});
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "948365659", 
+          "_rev" : "945791277", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "948562267", 
+          "_rev" : "945987885", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "948955483", 
+          "_rev" : "946381101", 
           "isCapital" : false, 
           "population" : 80000 
         } 
diff --git a/Documentation/Examples/generalGraphModuleCommonNeighbors2.generated b/Documentation/Examples/generalGraphModuleCommonNeighbors2.generated
index a1757ac7e3..7682d1cda4 100644
--- a/Documentation/Examples/generalGraphModuleCommonNeighbors2.generated
+++ b/Documentation/Examples/generalGraphModuleCommonNeighbors2.generated
@@ -12,21 +12,21 @@ arangosh> graph._commonNeighbors(
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "1069082971", 
+          "_rev" : "1066836269", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "1069672795", 
+          "_rev" : "1067426093", 
           "isCapital" : false, 
           "population" : 80000 
         }, 
         { 
           "_id" : "frenchCity/Paris", 
           "_key" : "Paris", 
-          "_rev" : "1069869403", 
+          "_rev" : "1067622701", 
           "isCapital" : true, 
           "population" : 4000000 
         } 
@@ -35,14 +35,14 @@ arangosh> graph._commonNeighbors(
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "1069672795", 
+          "_rev" : "1067426093", 
           "isCapital" : false, 
           "population" : 80000 
         }, 
         { 
           "_id" : "frenchCity/Paris", 
           "_key" : "Paris", 
-          "_rev" : "1069869403", 
+          "_rev" : "1067622701", 
           "isCapital" : true, 
           "population" : 4000000 
         } 
@@ -51,7 +51,7 @@ arangosh> graph._commonNeighbors(
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "1069672795", 
+          "_rev" : "1067426093", 
           "isCapital" : false, 
           "population" : 80000 
         } 
diff --git a/Documentation/Examples/generalGraphModuleConnectingEdges1.generated b/Documentation/Examples/generalGraphModuleConnectingEdges1.generated
index 290c08e016..31ef0f24b9 100644
--- a/Documentation/Examples/generalGraphModuleConnectingEdges1.generated
+++ b/Documentation/Examples/generalGraphModuleConnectingEdges1.generated
@@ -3,9 +3,9 @@ arangosh> var graph = examples.loadGraph("routeplanner");
 arangosh> graph._getConnectingEdges({isCapital : true}, {isCapital : true});
 [ 
   { 
-    "_id" : "internationalHighway/957213019", 
-    "_key" : "957213019", 
-    "_rev" : "957213019", 
+    "_id" : "internationalHighway/954638637", 
+    "_key" : "954638637", 
+    "_rev" : "954638637", 
     "_from" : "germanCity/Berlin", 
     "_to" : "frenchCity/Paris", 
     "distance" : 1200 
diff --git a/Documentation/Examples/generalGraphModuleDistanceTo1.generated b/Documentation/Examples/generalGraphModuleDistanceTo1.generated
index 49d0e74303..ee937a5d82 100644
--- a/Documentation/Examples/generalGraphModuleDistanceTo1.generated
+++ b/Documentation/Examples/generalGraphModuleDistanceTo1.generated
@@ -5,23 +5,23 @@ arangosh> g._distanceTo({}, {}, {weight : 'distance', endVertexCollectionRestric
 [ 
   [ 
     { 
-      "startVertex" : "germanCity/Berlin", 
-      "distance" : 1200, 
+      "startVertex" : "germanCity/Hamburg", 
+      "distance" : 900, 
       "vertex" : { 
         "_id" : "frenchCity/Paris", 
         "_key" : "Paris", 
-        "_rev" : "631236955", 
+        "_rev" : "629121325", 
         "isCapital" : true, 
         "population" : 4000000 
       } 
     }, 
     { 
-      "startVertex" : "germanCity/Berlin", 
-      "distance" : 1100, 
+      "startVertex" : "germanCity/Hamburg", 
+      "distance" : 1200, 
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "631040347", 
+        "_rev" : "628924717", 
         "isCapital" : false, 
         "population" : 80000 
       } 
@@ -32,7 +32,7 @@ arangosh> g._distanceTo({}, {}, {weight : 'distance', endVertexCollectionRestric
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "631040347", 
+        "_rev" : "628924717", 
         "isCapital" : false, 
         "population" : 80000 
       } 
@@ -43,29 +43,29 @@ arangosh> g._distanceTo({}, {}, {weight : 'distance', endVertexCollectionRestric
       "vertex" : { 
         "_id" : "frenchCity/Paris", 
         "_key" : "Paris", 
-        "_rev" : "631236955", 
+        "_rev" : "629121325", 
         "isCapital" : true, 
         "population" : 4000000 
       } 
     }, 
     { 
-      "startVertex" : "germanCity/Hamburg", 
-      "distance" : 1200, 
+      "startVertex" : "germanCity/Berlin", 
+      "distance" : 1100, 
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "631040347", 
+        "_rev" : "628924717", 
         "isCapital" : false, 
         "population" : 80000 
       } 
     }, 
     { 
-      "startVertex" : "germanCity/Hamburg", 
-      "distance" : 900, 
+      "startVertex" : "germanCity/Berlin", 
+      "distance" : 1200, 
       "vertex" : { 
         "_id" : "frenchCity/Paris", 
         "_key" : "Paris", 
-        "_rev" : "631236955", 
+        "_rev" : "629121325", 
         "isCapital" : true, 
         "population" : 4000000 
       } 
diff --git a/Documentation/Examples/generalGraphModuleDistanceTo2.generated b/Documentation/Examples/generalGraphModuleDistanceTo2.generated
index 43073425a2..6dd135a213 100644
--- a/Documentation/Examples/generalGraphModuleDistanceTo2.generated
+++ b/Documentation/Examples/generalGraphModuleDistanceTo2.generated
@@ -10,7 +10,7 @@ arangosh> g._distanceTo([{_id: 'germanCity/Cologne'},{_id: 'germanCity/Munich'}]
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "624879963", 
+        "_rev" : "622829869", 
         "isCapital" : false, 
         "population" : 80000 
       } 
diff --git a/Documentation/Examples/generalGraphModuleEccentricity2.generated b/Documentation/Examples/generalGraphModuleEccentricity2.generated
index 1ffe645482..aba5530c02 100644
--- a/Documentation/Examples/generalGraphModuleEccentricity2.generated
+++ b/Documentation/Examples/generalGraphModuleEccentricity2.generated
@@ -4,8 +4,8 @@ arangosh> graph._eccentricity();
 [ 
   { 
     "germanCity/Berlin" : 1, 
-    "germanCity/Hamburg" : 1, 
     "germanCity/Cologne" : 1, 
+    "germanCity/Hamburg" : 1, 
     "frenchCity/Paris" : 1, 
     "frenchCity/Lyon" : 1 
   } 
diff --git a/Documentation/Examples/generalGraphModuleEccentricity3.generated b/Documentation/Examples/generalGraphModuleEccentricity3.generated
index d99ac01e9a..54449c2b29 100644
--- a/Documentation/Examples/generalGraphModuleEccentricity3.generated
+++ b/Documentation/Examples/generalGraphModuleEccentricity3.generated
@@ -3,9 +3,9 @@ arangosh> var graph = examples.loadGraph("routeplanner");
 arangosh> graph._eccentricity({weight : 'distance'});
 [ 
   { 
-    "germanCity/Hamburg" : 0.7083333333333335, 
-    "germanCity/Cologne" : 1, 
     "germanCity/Berlin" : 0.7083333333333335, 
+    "germanCity/Cologne" : 1, 
+    "germanCity/Hamburg" : 0.7083333333333335, 
     "frenchCity/Paris" : 0.7083333333333335, 
     "frenchCity/Lyon" : 0.7083333333333335 
   } 
diff --git a/Documentation/Examples/generalGraphModuleNeighbors1.generated b/Documentation/Examples/generalGraphModuleNeighbors1.generated
index b18b9750f0..c2e80890c5 100644
--- a/Documentation/Examples/generalGraphModuleNeighbors1.generated
+++ b/Documentation/Examples/generalGraphModuleNeighbors1.generated
@@ -5,56 +5,56 @@ arangosh> graph._neighbors({isCapital : true});
   { 
     "_id" : "germanCity/Cologne", 
     "_key" : "Cologne", 
-    "_rev" : "593553755", 
+    "_rev" : "591569197", 
     "isCapital" : false, 
     "population" : 1000000 
   }, 
   { 
     "_id" : "germanCity/Hamburg", 
     "_key" : "Hamburg", 
-    "_rev" : "593750363", 
+    "_rev" : "591765805", 
     "isCapital" : false, 
     "population" : 1000000 
   }, 
   { 
     "_id" : "frenchCity/Lyon", 
     "_key" : "Lyon", 
-    "_rev" : "594143579", 
+    "_rev" : "592159021", 
     "isCapital" : false, 
     "population" : 80000 
   }, 
   { 
     "_id" : "frenchCity/Paris", 
     "_key" : "Paris", 
-    "_rev" : "594340187", 
+    "_rev" : "592355629", 
     "isCapital" : true, 
     "population" : 4000000 
   }, 
   { 
     "_id" : "frenchCity/Lyon", 
     "_key" : "Lyon", 
-    "_rev" : "594143579", 
+    "_rev" : "592159021", 
     "isCapital" : false, 
     "population" : 80000 
   }, 
   { 
     "_id" : "germanCity/Berlin", 
     "_key" : "Berlin", 
-    "_rev" : "593357147", 
+    "_rev" : "591372589", 
     "isCapital" : true, 
     "population" : 3000000 
   }, 
   { 
     "_id" : "germanCity/Cologne", 
     "_key" : "Cologne", 
-    "_rev" : "593553755", 
+    "_rev" : "591569197", 
     "isCapital" : false, 
     "population" : 1000000 
   }, 
   { 
     "_id" : "germanCity/Hamburg", 
     "_key" : "Hamburg", 
-    "_rev" : "593750363", 
+    "_rev" : "591765805", 
     "isCapital" : false, 
     "population" : 1000000 
   } 
diff --git a/Documentation/Examples/generalGraphModuleNeighbors2.generated b/Documentation/Examples/generalGraphModuleNeighbors2.generated
index 5a2d5fe3ac..a8c6dcfb06 100644
--- a/Documentation/Examples/generalGraphModuleNeighbors2.generated
+++ b/Documentation/Examples/generalGraphModuleNeighbors2.generated
@@ -5,42 +5,42 @@ arangosh> graph._neighbors('germanCity/Hamburg', {direction : 'outbound', maxDep
   { 
     "_id" : "germanCity/Cologne", 
     "_key" : "Cologne", 
-    "_rev" : "587458907", 
+    "_rev" : "585408813", 
     "isCapital" : false, 
     "population" : 1000000 
   }, 
   { 
     "_id" : "frenchCity/Lyon", 
     "_key" : "Lyon", 
-    "_rev" : "588048731", 
+    "_rev" : "585998637", 
     "isCapital" : false, 
     "population" : 80000 
   }, 
   { 
     "_id" : "frenchCity/Paris", 
     "_key" : "Paris", 
-    "_rev" : "588245339", 
+    "_rev" : "586195245", 
     "isCapital" : true, 
     "population" : 4000000 
   }, 
   { 
     "_id" : "frenchCity/Paris", 
     "_key" : "Paris", 
-    "_rev" : "588245339", 
+    "_rev" : "586195245", 
     "isCapital" : true, 
     "population" : 4000000 
   }, 
   { 
     "_id" : "frenchCity/Lyon", 
     "_key" : "Lyon", 
-    "_rev" : "588048731", 
+    "_rev" : "585998637", 
     "isCapital" : false, 
     "population" : 80000 
   }, 
   { 
     "_id" : "frenchCity/Lyon", 
     "_key" : "Lyon", 
-    "_rev" : "588048731", 
+    "_rev" : "585998637", 
     "isCapital" : false, 
     "population" : 80000 
   } 
diff --git a/Documentation/Examples/generalGraphModulePaths.generated b/Documentation/Examples/generalGraphModulePaths.generated
index 8c89c974e9..f6f3fb829e 100644
--- a/Documentation/Examples/generalGraphModulePaths.generated
+++ b/Documentation/Examples/generalGraphModulePaths.generated
@@ -8,7 +8,7 @@ arangosh> g._paths();
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "224061787", 
+          "_rev" : "223519021", 
           "name" : "Diana" 
         } 
       ], 
@@ -16,13 +16,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "224061787", 
+        "_rev" : "223519021", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "224061787", 
+        "_rev" : "223519021", 
         "name" : "Diana" 
       } 
     }, 
@@ -31,7 +31,7 @@ arangosh> g._paths();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "223340891", 
+          "_rev" : "222798125", 
           "name" : "Alice" 
         } 
       ], 
@@ -39,13 +39,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "223340891", 
+        "_rev" : "222798125", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "223340891", 
+        "_rev" : "222798125", 
         "name" : "Alice" 
       } 
     }, 
@@ -54,13 +54,13 @@ arangosh> g._paths();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "223340891", 
+          "_rev" : "222798125", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "223668571", 
+          "_rev" : "223125805", 
           "name" : "Bob" 
         } 
       ], 
@@ -68,7 +68,7 @@ arangosh> g._paths();
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "224389467", 
+          "_rev" : "223846701", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -77,13 +77,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "223340891", 
+        "_rev" : "222798125", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "223668571", 
+        "_rev" : "223125805", 
         "name" : "Bob" 
       } 
     }, 
@@ -92,19 +92,19 @@ arangosh> g._paths();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "223340891", 
+          "_rev" : "222798125", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "223668571", 
+          "_rev" : "223125805", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "224061787", 
+          "_rev" : "223519021", 
           "name" : "Diana" 
         } 
       ], 
@@ -112,7 +112,7 @@ arangosh> g._paths();
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "224389467", 
+          "_rev" : "223846701", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -120,7 +120,7 @@ arangosh> g._paths();
         { 
           "_id" : "relation/bobAndDiana", 
           "_key" : "bobAndDiana", 
-          "_rev" : "225044827", 
+          "_rev" : "224502061", 
           "_from" : "male/bob", 
           "_to" : "female/diana", 
           "type" : "friend" 
@@ -129,13 +129,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "223340891", 
+        "_rev" : "222798125", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "224061787", 
+        "_rev" : "223519021", 
         "name" : "Diana" 
       } 
     }, 
@@ -144,13 +144,13 @@ arangosh> g._paths();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "223340891", 
+          "_rev" : "222798125", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "223865179", 
+          "_rev" : "223322413", 
           "name" : "Charly" 
         } 
       ], 
@@ -158,7 +158,7 @@ arangosh> g._paths();
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "224651611", 
+          "_rev" : "224108845", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -167,13 +167,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "223340891", 
+        "_rev" : "222798125", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "223865179", 
+        "_rev" : "223322413", 
         "name" : "Charly" 
       } 
     }, 
@@ -182,19 +182,19 @@ arangosh> g._paths();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "223340891", 
+          "_rev" : "222798125", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "223865179", 
+          "_rev" : "223322413", 
           "name" : "Charly" 
         }, 
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "224061787", 
+          "_rev" : "223519021", 
           "name" : "Diana" 
         } 
       ], 
@@ -202,7 +202,7 @@ arangosh> g._paths();
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "224651611", 
+          "_rev" : "224108845", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -210,7 +210,7 @@ arangosh> g._paths();
         { 
           "_id" : "relation/charlyAndDiana", 
           "_key" : "charlyAndDiana", 
-          "_rev" : "224848219", 
+          "_rev" : "224305453", 
           "_from" : "male/charly", 
           "_to" : "female/diana", 
           "type" : "married" 
@@ -219,13 +219,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "223340891", 
+        "_rev" : "222798125", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "224061787", 
+        "_rev" : "223519021", 
         "name" : "Diana" 
       } 
     }, 
@@ -234,7 +234,7 @@ arangosh> g._paths();
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "223668571", 
+          "_rev" : "223125805", 
           "name" : "Bob" 
         } 
       ], 
@@ -242,13 +242,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "223668571", 
+        "_rev" : "223125805", 
         "name" : "Bob" 
       }, 
       "destination" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "223668571", 
+        "_rev" : "223125805", 
         "name" : "Bob" 
       } 
     }, 
@@ -257,13 +257,13 @@ arangosh> g._paths();
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "223668571", 
+          "_rev" : "223125805", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "224061787", 
+          "_rev" : "223519021", 
           "name" : "Diana" 
         } 
       ], 
@@ -271,7 +271,7 @@ arangosh> g._paths();
         { 
           "_id" : "relation/bobAndDiana", 
           "_key" : "bobAndDiana", 
-          "_rev" : "225044827", 
+          "_rev" : "224502061", 
           "_from" : "male/bob", 
           "_to" : "female/diana", 
           "type" : "friend" 
@@ -280,13 +280,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "223668571", 
+        "_rev" : "223125805", 
         "name" : "Bob" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "224061787", 
+        "_rev" : "223519021", 
         "name" : "Diana" 
       } 
     }, 
@@ -295,7 +295,7 @@ arangosh> g._paths();
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "223865179", 
+          "_rev" : "223322413", 
           "name" : "Charly" 
         } 
       ], 
@@ -303,13 +303,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "223865179", 
+        "_rev" : "223322413", 
         "name" : "Charly" 
       }, 
       "destination" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "223865179", 
+        "_rev" : "223322413", 
         "name" : "Charly" 
       } 
     }, 
@@ -318,13 +318,13 @@ arangosh> g._paths();
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "223865179", 
+          "_rev" : "223322413", 
           "name" : "Charly" 
         }, 
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "224061787", 
+          "_rev" : "223519021", 
           "name" : "Diana" 
         } 
       ], 
@@ -332,7 +332,7 @@ arangosh> g._paths();
         { 
           "_id" : "relation/charlyAndDiana", 
           "_key" : "charlyAndDiana", 
-          "_rev" : "224848219", 
+          "_rev" : "224305453", 
           "_from" : "male/charly", 
           "_to" : "female/diana", 
           "type" : "married" 
@@ -341,13 +341,13 @@ arangosh> g._paths();
       "source" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "223865179", 
+        "_rev" : "223322413", 
         "name" : "Charly" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "224061787", 
+        "_rev" : "223519021", 
         "name" : "Diana" 
       } 
     } 
diff --git a/Documentation/Examples/generalGraphModulePaths2.generated b/Documentation/Examples/generalGraphModulePaths2.generated
index 876ba0cf42..b207f8023e 100644
--- a/Documentation/Examples/generalGraphModulePaths2.generated
+++ b/Documentation/Examples/generalGraphModulePaths2.generated
@@ -8,13 +8,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "775416155", 
+          "_rev" : "772841773", 
           "name" : "Diana" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "775219547", 
+          "_rev" : "772645165", 
           "name" : "Charly" 
         } 
       ], 
@@ -22,7 +22,7 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "relation/charlyAndDiana", 
           "_key" : "charlyAndDiana", 
-          "_rev" : "776202587", 
+          "_rev" : "773628205", 
           "_from" : "male/charly", 
           "_to" : "female/diana", 
           "type" : "married" 
@@ -31,13 +31,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "775416155", 
+        "_rev" : "772841773", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "775219547", 
+        "_rev" : "772645165", 
         "name" : "Charly" 
       } 
     }, 
@@ -46,19 +46,19 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "775416155", 
+          "_rev" : "772841773", 
           "name" : "Diana" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "775219547", 
+          "_rev" : "772645165", 
           "name" : "Charly" 
         }, 
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "774695259", 
+          "_rev" : "772120877", 
           "name" : "Alice" 
         } 
       ], 
@@ -66,7 +66,7 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "relation/charlyAndDiana", 
           "_key" : "charlyAndDiana", 
-          "_rev" : "776202587", 
+          "_rev" : "773628205", 
           "_from" : "male/charly", 
           "_to" : "female/diana", 
           "type" : "married" 
@@ -74,7 +74,7 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "776005979", 
+          "_rev" : "773431597", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -83,13 +83,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "775416155", 
+        "_rev" : "772841773", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "774695259", 
+        "_rev" : "772120877", 
         "name" : "Alice" 
       } 
     }, 
@@ -98,13 +98,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "775416155", 
+          "_rev" : "772841773", 
           "name" : "Diana" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "775022939", 
+          "_rev" : "772448557", 
           "name" : "Bob" 
         } 
       ], 
@@ -112,7 +112,7 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "relation/bobAndDiana", 
           "_key" : "bobAndDiana", 
-          "_rev" : "776399195", 
+          "_rev" : "773824813", 
           "_from" : "male/bob", 
           "_to" : "female/diana", 
           "type" : "friend" 
@@ -121,13 +121,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "775416155", 
+        "_rev" : "772841773", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "775022939", 
+        "_rev" : "772448557", 
         "name" : "Bob" 
       } 
     }, 
@@ -136,19 +136,19 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "775416155", 
+          "_rev" : "772841773", 
           "name" : "Diana" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "775022939", 
+          "_rev" : "772448557", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "774695259", 
+          "_rev" : "772120877", 
           "name" : "Alice" 
         } 
       ], 
@@ -156,7 +156,7 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "relation/bobAndDiana", 
           "_key" : "bobAndDiana", 
-          "_rev" : "776399195", 
+          "_rev" : "773824813", 
           "_from" : "male/bob", 
           "_to" : "female/diana", 
           "type" : "friend" 
@@ -164,7 +164,7 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "775743835", 
+          "_rev" : "773169453", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -173,13 +173,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "775416155", 
+        "_rev" : "772841773", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "774695259", 
+        "_rev" : "772120877", 
         "name" : "Alice" 
       } 
     }, 
@@ -188,13 +188,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "775022939", 
+          "_rev" : "772448557", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "774695259", 
+          "_rev" : "772120877", 
           "name" : "Alice" 
         } 
       ], 
@@ -202,7 +202,7 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "775743835", 
+          "_rev" : "773169453", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -211,13 +211,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
       "source" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "775022939", 
+        "_rev" : "772448557", 
         "name" : "Bob" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "774695259", 
+        "_rev" : "772120877", 
         "name" : "Alice" 
       } 
     }, 
@@ -226,13 +226,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "775219547", 
+          "_rev" : "772645165", 
           "name" : "Charly" 
         }, 
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "774695259", 
+          "_rev" : "772120877", 
           "name" : "Alice" 
         } 
       ], 
@@ -240,7 +240,7 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "776005979", 
+          "_rev" : "773431597", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -249,13 +249,13 @@ arangosh> g._paths({direction : 'inbound', minLength : 1, maxLength :  2});
       "source" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "775219547", 
+        "_rev" : "772645165", 
         "name" : "Charly" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "774695259", 
+        "_rev" : "772120877", 
         "name" : "Alice" 
       } 
     } 
diff --git a/Documentation/Examples/generalGraphModuleShortestPaths1.generated b/Documentation/Examples/generalGraphModuleShortestPaths1.generated
index 08fc52e8e3..0df52db71d 100644
--- a/Documentation/Examples/generalGraphModuleShortestPaths1.generated
+++ b/Documentation/Examples/generalGraphModuleShortestPaths1.generated
@@ -9,7 +9,7 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "494463323", 
+        "_rev" : "493461805", 
         "isCapital" : false, 
         "population" : 80000 
       }, 
@@ -17,9 +17,9 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
         { 
           "edges" : [ 
             { 
-              "_id" : "internationalHighway/496036187", 
-              "_key" : "496036187", 
-              "_rev" : "496036187", 
+              "_id" : "internationalHighway/495034669", 
+              "_key" : "495034669", 
+              "_rev" : "495034669", 
               "_from" : "germanCity/Berlin", 
               "_to" : "frenchCity/Lyon", 
               "distance" : 1100 
@@ -29,14 +29,14 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
             { 
               "_id" : "germanCity/Berlin", 
               "_key" : "Berlin", 
-              "_rev" : "493676891", 
+              "_rev" : "492675373", 
               "isCapital" : true, 
               "population" : 3000000 
             }, 
             { 
               "_id" : "frenchCity/Lyon", 
               "_key" : "Lyon", 
-              "_rev" : "494463323", 
+              "_rev" : "493461805", 
               "isCapital" : false, 
               "population" : 80000 
             } 
@@ -50,7 +50,7 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
       "vertex" : { 
         "_id" : "frenchCity/Paris", 
         "_key" : "Paris", 
-        "_rev" : "494659931", 
+        "_rev" : "493658413", 
         "isCapital" : true, 
         "population" : 4000000 
       }, 
@@ -58,9 +58,9 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
         { 
           "edges" : [ 
             { 
-              "_id" : "internationalHighway/496232795", 
-              "_key" : "496232795", 
-              "_rev" : "496232795", 
+              "_id" : "internationalHighway/495231277", 
+              "_key" : "495231277", 
+              "_rev" : "495231277", 
               "_from" : "germanCity/Berlin", 
               "_to" : "frenchCity/Paris", 
               "distance" : 1200 
@@ -70,14 +70,14 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
             { 
               "_id" : "germanCity/Berlin", 
               "_key" : "Berlin", 
-              "_rev" : "493676891", 
+              "_rev" : "492675373", 
               "isCapital" : true, 
               "population" : 3000000 
             }, 
             { 
               "_id" : "frenchCity/Paris", 
               "_key" : "Paris", 
-              "_rev" : "494659931", 
+              "_rev" : "493658413", 
               "isCapital" : true, 
               "population" : 4000000 
             } 
@@ -86,53 +86,12 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
       ], 
       "distance" : 1200 
     }, 
-    { 
-      "startVertex" : "germanCity/Cologne", 
-      "vertex" : { 
-        "_id" : "frenchCity/Paris", 
-        "_key" : "Paris", 
-        "_rev" : "494659931", 
-        "isCapital" : true, 
-        "population" : 4000000 
-      }, 
-      "paths" : [ 
-        { 
-          "edges" : [ 
-            { 
-              "_id" : "internationalHighway/497019227", 
-              "_key" : "497019227", 
-              "_rev" : "497019227", 
-              "_from" : "germanCity/Cologne", 
-              "_to" : "frenchCity/Paris", 
-              "distance" : 550 
-            } 
-          ], 
-          "vertices" : [ 
-            { 
-              "_id" : "germanCity/Cologne", 
-              "_key" : "Cologne", 
-              "_rev" : "493873499", 
-              "isCapital" : false, 
-              "population" : 1000000 
-            }, 
-            { 
-              "_id" : "frenchCity/Paris", 
-              "_key" : "Paris", 
-              "_rev" : "494659931", 
-              "isCapital" : true, 
-              "population" : 4000000 
-            } 
-          ] 
-        } 
-      ], 
-      "distance" : 550 
-    }, 
     { 
       "startVertex" : "germanCity/Cologne", 
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "494463323", 
+        "_rev" : "493461805", 
         "isCapital" : false, 
         "population" : 80000 
       }, 
@@ -140,9 +99,9 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
         { 
           "edges" : [ 
             { 
-              "_id" : "internationalHighway/496822619", 
-              "_key" : "496822619", 
-              "_rev" : "496822619", 
+              "_id" : "internationalHighway/495821101", 
+              "_key" : "495821101", 
+              "_rev" : "495821101", 
               "_from" : "germanCity/Cologne", 
               "_to" : "frenchCity/Lyon", 
               "distance" : 700 
@@ -152,14 +111,14 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
             { 
               "_id" : "germanCity/Cologne", 
               "_key" : "Cologne", 
-              "_rev" : "493873499", 
+              "_rev" : "492871981", 
               "isCapital" : false, 
               "population" : 1000000 
             }, 
             { 
               "_id" : "frenchCity/Lyon", 
               "_key" : "Lyon", 
-              "_rev" : "494463323", 
+              "_rev" : "493461805", 
               "isCapital" : false, 
               "population" : 80000 
             } 
@@ -169,11 +128,11 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
       "distance" : 700 
     }, 
     { 
-      "startVertex" : "germanCity/Hamburg", 
+      "startVertex" : "germanCity/Cologne", 
       "vertex" : { 
         "_id" : "frenchCity/Paris", 
         "_key" : "Paris", 
-        "_rev" : "494659931", 
+        "_rev" : "493658413", 
         "isCapital" : true, 
         "population" : 4000000 
       }, 
@@ -181,40 +140,40 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
         { 
           "edges" : [ 
             { 
-              "_id" : "internationalHighway/496429403", 
-              "_key" : "496429403", 
-              "_rev" : "496429403", 
-              "_from" : "germanCity/Hamburg", 
+              "_id" : "internationalHighway/496017709", 
+              "_key" : "496017709", 
+              "_rev" : "496017709", 
+              "_from" : "germanCity/Cologne", 
               "_to" : "frenchCity/Paris", 
-              "distance" : 900 
+              "distance" : 550 
             } 
           ], 
           "vertices" : [ 
             { 
-              "_id" : "germanCity/Hamburg", 
-              "_key" : "Hamburg", 
-              "_rev" : "494070107", 
+              "_id" : "germanCity/Cologne", 
+              "_key" : "Cologne", 
+              "_rev" : "492871981", 
               "isCapital" : false, 
               "population" : 1000000 
             }, 
             { 
               "_id" : "frenchCity/Paris", 
               "_key" : "Paris", 
-              "_rev" : "494659931", 
+              "_rev" : "493658413", 
               "isCapital" : true, 
               "population" : 4000000 
             } 
           ] 
         } 
       ], 
-      "distance" : 900 
+      "distance" : 550 
     }, 
     { 
       "startVertex" : "germanCity/Hamburg", 
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "494463323", 
+        "_rev" : "493461805", 
         "isCapital" : false, 
         "population" : 80000 
       }, 
@@ -222,17 +181,17 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
         { 
           "edges" : [ 
             { 
-              "_id" : "germanHighway/495380827", 
-              "_key" : "495380827", 
-              "_rev" : "495380827", 
+              "_id" : "germanHighway/494379309", 
+              "_key" : "494379309", 
+              "_rev" : "494379309", 
               "_from" : "germanCity/Hamburg", 
               "_to" : "germanCity/Cologne", 
               "distance" : 500 
             }, 
             { 
-              "_id" : "internationalHighway/496822619", 
-              "_key" : "496822619", 
-              "_rev" : "496822619", 
+              "_id" : "internationalHighway/495821101", 
+              "_key" : "495821101", 
+              "_rev" : "495821101", 
               "_from" : "germanCity/Cologne", 
               "_to" : "frenchCity/Lyon", 
               "distance" : 700 
@@ -242,21 +201,21 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
             { 
               "_id" : "germanCity/Hamburg", 
               "_key" : "Hamburg", 
-              "_rev" : "494070107", 
+              "_rev" : "493068589", 
               "isCapital" : false, 
               "population" : 1000000 
             }, 
             { 
               "_id" : "germanCity/Cologne", 
               "_key" : "Cologne", 
-              "_rev" : "493873499", 
+              "_rev" : "492871981", 
               "isCapital" : false, 
               "population" : 1000000 
             }, 
             { 
               "_id" : "frenchCity/Lyon", 
               "_key" : "Lyon", 
-              "_rev" : "494463323", 
+              "_rev" : "493461805", 
               "isCapital" : false, 
               "population" : 80000 
             } 
@@ -264,6 +223,47 @@ arangosh> g._shortestPath({}, {}, {weight : 'distance', endVertexCollectionRestr
         } 
       ], 
       "distance" : 1200 
+    }, 
+    { 
+      "startVertex" : "germanCity/Hamburg", 
+      "vertex" : { 
+        "_id" : "frenchCity/Paris", 
+        "_key" : "Paris", 
+        "_rev" : "493658413", 
+        "isCapital" : true, 
+        "population" : 4000000 
+      }, 
+      "paths" : [ 
+        { 
+          "edges" : [ 
+            { 
+              "_id" : "internationalHighway/495427885", 
+              "_key" : "495427885", 
+              "_rev" : "495427885", 
+              "_from" : "germanCity/Hamburg", 
+              "_to" : "frenchCity/Paris", 
+              "distance" : 900 
+            } 
+          ], 
+          "vertices" : [ 
+            { 
+              "_id" : "germanCity/Hamburg", 
+              "_key" : "Hamburg", 
+              "_rev" : "493068589", 
+              "isCapital" : false, 
+              "population" : 1000000 
+            }, 
+            { 
+              "_id" : "frenchCity/Paris", 
+              "_key" : "Paris", 
+              "_rev" : "493658413", 
+              "isCapital" : true, 
+              "population" : 4000000 
+            } 
+          ] 
+        } 
+      ], 
+      "distance" : 900 
     } 
   ] 
 ]
diff --git a/Documentation/Examples/generalGraphModuleShortestPaths2.generated b/Documentation/Examples/generalGraphModuleShortestPaths2.generated
index fcb7b34dec..4378f8ccf5 100644
--- a/Documentation/Examples/generalGraphModuleShortestPaths2.generated
+++ b/Documentation/Examples/generalGraphModuleShortestPaths2.generated
@@ -8,7 +8,7 @@ arangosh> g._shortestPath([{_id: 'germanCity/Cologne'},{_id: 'germanCity/Munich'
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "502458715", 
+        "_rev" : "500539693", 
         "isCapital" : false, 
         "population" : 80000 
       }, 
@@ -18,23 +18,23 @@ arangosh> g._shortestPath([{_id: 'germanCity/Cologne'},{_id: 'germanCity/Munich'
           { 
             "_id" : "germanCity/Cologne", 
             "_key" : "Cologne", 
-            "_rev" : "501868891", 
+            "_rev" : "499949869", 
             "isCapital" : false, 
             "population" : 1000000 
           }, 
           { 
             "_id" : "frenchCity/Lyon", 
             "_key" : "Lyon", 
-            "_rev" : "502458715", 
+            "_rev" : "500539693", 
             "isCapital" : false, 
             "population" : 80000 
           } 
         ], 
         "edges" : [ 
           { 
-            "_id" : "internationalHighway/504818011", 
-            "_key" : "504818011", 
-            "_rev" : "504818011", 
+            "_id" : "internationalHighway/502898989", 
+            "_key" : "502898989", 
+            "_rev" : "502898989", 
             "_from" : "germanCity/Cologne", 
             "_to" : "frenchCity/Lyon", 
             "distance" : 700 
@@ -48,23 +48,23 @@ arangosh> g._shortestPath([{_id: 'germanCity/Cologne'},{_id: 'germanCity/Munich'
             { 
               "_id" : "germanCity/Cologne", 
               "_key" : "Cologne", 
-              "_rev" : "501868891", 
+              "_rev" : "499949869", 
               "isCapital" : false, 
               "population" : 1000000 
             }, 
             { 
               "_id" : "frenchCity/Lyon", 
               "_key" : "Lyon", 
-              "_rev" : "502458715", 
+              "_rev" : "500539693", 
               "isCapital" : false, 
               "population" : 80000 
             } 
           ], 
           "edges" : [ 
             { 
-              "_id" : "internationalHighway/504818011", 
-              "_key" : "504818011", 
-              "_rev" : "504818011", 
+              "_id" : "internationalHighway/502898989", 
+              "_key" : "502898989", 
+              "_rev" : "502898989", 
               "_from" : "germanCity/Cologne", 
               "_to" : "frenchCity/Lyon", 
               "distance" : 700 
diff --git a/Documentation/Examples/generalGraphNeighbors1.generated b/Documentation/Examples/generalGraphNeighbors1.generated
index 6c993cf19f..ccb73f886c 100644
--- a/Documentation/Examples/generalGraphNeighbors1.generated
+++ b/Documentation/Examples/generalGraphNeighbors1.generated
@@ -8,16 +8,16 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
     "vertex" : { 
       "_id" : "frenchCity/Lyon", 
       "_key" : "Lyon", 
-      "_rev" : "477030747", 
+      "_rev" : "472817965", 
       "isCapital" : false, 
       "population" : 80000 
     }, 
     "path" : { 
       "edges" : [ 
         { 
-          "_id" : "internationalHighway/479390043", 
-          "_key" : "479390043", 
-          "_rev" : "479390043", 
+          "_id" : "internationalHighway/475177261", 
+          "_key" : "475177261", 
+          "_rev" : "475177261", 
           "_from" : "germanCity/Cologne", 
           "_to" : "frenchCity/Lyon", 
           "distance" : 700 
@@ -27,14 +27,14 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "476440923", 
+          "_rev" : "472228141", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "477030747", 
+          "_rev" : "472817965", 
           "isCapital" : false, 
           "population" : 80000 
         } 
@@ -46,16 +46,16 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
     "vertex" : { 
       "_id" : "germanCity/Cologne", 
       "_key" : "Cologne", 
-      "_rev" : "476440923", 
+      "_rev" : "472228141", 
       "isCapital" : false, 
       "population" : 1000000 
     }, 
     "path" : { 
       "edges" : [ 
         { 
-          "_id" : "internationalHighway/479390043", 
-          "_key" : "479390043", 
-          "_rev" : "479390043", 
+          "_id" : "internationalHighway/475177261", 
+          "_key" : "475177261", 
+          "_rev" : "475177261", 
           "_from" : "germanCity/Cologne", 
           "_to" : "frenchCity/Lyon", 
           "distance" : 700 
@@ -65,14 +65,14 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "477030747", 
+          "_rev" : "472817965", 
           "isCapital" : false, 
           "population" : 80000 
         }, 
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "476440923", 
+          "_rev" : "472228141", 
           "isCapital" : false, 
           "population" : 1000000 
         } 
diff --git a/Documentation/Examples/generalGraphNeighbors2.generated b/Documentation/Examples/generalGraphNeighbors2.generated
index 87f535a2a3..45550eff9d 100644
--- a/Documentation/Examples/generalGraphNeighbors2.generated
+++ b/Documentation/Examples/generalGraphNeighbors2.generated
@@ -8,16 +8,16 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
     "vertex" : { 
       "_id" : "germanCity/Cologne", 
       "_key" : "Cologne", 
-      "_rev" : "238479707", 
+      "_rev" : "237871405", 
       "isCapital" : false, 
       "population" : 1000000 
     }, 
     "path" : { 
       "edges" : [ 
         { 
-          "_id" : "germanHighway/239987035", 
-          "_key" : "239987035", 
-          "_rev" : "239987035", 
+          "_id" : "germanHighway/239378733", 
+          "_key" : "239378733", 
+          "_rev" : "239378733", 
           "_from" : "germanCity/Hamburg", 
           "_to" : "germanCity/Cologne", 
           "distance" : 500 
@@ -27,14 +27,14 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "238676315", 
+          "_rev" : "238068013", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "238479707", 
+          "_rev" : "237871405", 
           "isCapital" : false, 
           "population" : 1000000 
         } 
@@ -46,24 +46,24 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
     "vertex" : { 
       "_id" : "frenchCity/Lyon", 
       "_key" : "Lyon", 
-      "_rev" : "239069531", 
+      "_rev" : "238461229", 
       "isCapital" : false, 
       "population" : 80000 
     }, 
     "path" : { 
       "edges" : [ 
         { 
-          "_id" : "germanHighway/239987035", 
-          "_key" : "239987035", 
-          "_rev" : "239987035", 
+          "_id" : "germanHighway/239378733", 
+          "_key" : "239378733", 
+          "_rev" : "239378733", 
           "_from" : "germanCity/Hamburg", 
           "_to" : "germanCity/Cologne", 
           "distance" : 500 
         }, 
         { 
-          "_id" : "internationalHighway/241428827", 
-          "_key" : "241428827", 
-          "_rev" : "241428827", 
+          "_id" : "internationalHighway/240820525", 
+          "_key" : "240820525", 
+          "_rev" : "240820525", 
           "_from" : "germanCity/Cologne", 
           "_to" : "frenchCity/Lyon", 
           "distance" : 700 
@@ -73,21 +73,21 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "238676315", 
+          "_rev" : "238068013", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "238479707", 
+          "_rev" : "237871405", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "239069531", 
+          "_rev" : "238461229", 
           "isCapital" : false, 
           "population" : 80000 
         } 
@@ -99,24 +99,24 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
     "vertex" : { 
       "_id" : "frenchCity/Paris", 
       "_key" : "Paris", 
-      "_rev" : "239266139", 
+      "_rev" : "238657837", 
       "isCapital" : true, 
       "population" : 4000000 
     }, 
     "path" : { 
       "edges" : [ 
         { 
-          "_id" : "germanHighway/239987035", 
-          "_key" : "239987035", 
-          "_rev" : "239987035", 
+          "_id" : "germanHighway/239378733", 
+          "_key" : "239378733", 
+          "_rev" : "239378733", 
           "_from" : "germanCity/Hamburg", 
           "_to" : "germanCity/Cologne", 
           "distance" : 500 
         }, 
         { 
-          "_id" : "internationalHighway/241625435", 
-          "_key" : "241625435", 
-          "_rev" : "241625435", 
+          "_id" : "internationalHighway/241017133", 
+          "_key" : "241017133", 
+          "_rev" : "241017133", 
           "_from" : "germanCity/Cologne", 
           "_to" : "frenchCity/Paris", 
           "distance" : 550 
@@ -126,21 +126,21 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "238676315", 
+          "_rev" : "238068013", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "germanCity/Cologne", 
           "_key" : "Cologne", 
-          "_rev" : "238479707", 
+          "_rev" : "237871405", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Paris", 
           "_key" : "Paris", 
-          "_rev" : "239266139", 
+          "_rev" : "238657837", 
           "isCapital" : true, 
           "population" : 4000000 
         } 
@@ -152,16 +152,16 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
     "vertex" : { 
       "_id" : "frenchCity/Paris", 
       "_key" : "Paris", 
-      "_rev" : "239266139", 
+      "_rev" : "238657837", 
       "isCapital" : true, 
       "population" : 4000000 
     }, 
     "path" : { 
       "edges" : [ 
         { 
-          "_id" : "internationalHighway/241035611", 
-          "_key" : "241035611", 
-          "_rev" : "241035611", 
+          "_id" : "internationalHighway/240427309", 
+          "_key" : "240427309", 
+          "_rev" : "240427309", 
           "_from" : "germanCity/Hamburg", 
           "_to" : "frenchCity/Paris", 
           "distance" : 900 
@@ -171,14 +171,14 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "238676315", 
+          "_rev" : "238068013", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Paris", 
           "_key" : "Paris", 
-          "_rev" : "239266139", 
+          "_rev" : "238657837", 
           "isCapital" : true, 
           "population" : 4000000 
         } 
@@ -190,24 +190,24 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
     "vertex" : { 
       "_id" : "frenchCity/Lyon", 
       "_key" : "Lyon", 
-      "_rev" : "239069531", 
+      "_rev" : "238461229", 
       "isCapital" : false, 
       "population" : 80000 
     }, 
     "path" : { 
       "edges" : [ 
         { 
-          "_id" : "internationalHighway/241035611", 
-          "_key" : "241035611", 
-          "_rev" : "241035611", 
+          "_id" : "internationalHighway/240427309", 
+          "_key" : "240427309", 
+          "_rev" : "240427309", 
           "_from" : "germanCity/Hamburg", 
           "_to" : "frenchCity/Paris", 
           "distance" : 900 
         }, 
         { 
-          "_id" : "frenchHighway/240314715", 
-          "_key" : "240314715", 
-          "_rev" : "240314715", 
+          "_id" : "frenchHighway/239706413", 
+          "_key" : "239706413", 
+          "_rev" : "239706413", 
           "_from" : "frenchCity/Paris", 
           "_to" : "frenchCity/Lyon", 
           "distance" : 550 
@@ -217,21 +217,21 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "238676315", 
+          "_rev" : "238068013", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Paris", 
           "_key" : "Paris", 
-          "_rev" : "239266139", 
+          "_rev" : "238657837", 
           "isCapital" : true, 
           "population" : 4000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "239069531", 
+          "_rev" : "238461229", 
           "isCapital" : false, 
           "population" : 80000 
         } 
@@ -243,16 +243,16 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
     "vertex" : { 
       "_id" : "frenchCity/Lyon", 
       "_key" : "Lyon", 
-      "_rev" : "239069531", 
+      "_rev" : "238461229", 
       "isCapital" : false, 
       "population" : 80000 
     }, 
     "path" : { 
       "edges" : [ 
         { 
-          "_id" : "internationalHighway/241232219", 
-          "_key" : "241232219", 
-          "_rev" : "241232219", 
+          "_id" : "internationalHighway/240623917", 
+          "_key" : "240623917", 
+          "_rev" : "240623917", 
           "_from" : "germanCity/Hamburg", 
           "_to" : "frenchCity/Lyon", 
           "distance" : 1300 
@@ -262,14 +262,14 @@ arangosh> db._query("FOR e IN GRAPH_NEIGHBORS("
         { 
           "_id" : "germanCity/Hamburg", 
           "_key" : "Hamburg", 
-          "_rev" : "238676315", 
+          "_rev" : "238068013", 
           "isCapital" : false, 
           "population" : 1000000 
         }, 
         { 
           "_id" : "frenchCity/Lyon", 
           "_key" : "Lyon", 
-          "_rev" : "239069531", 
+          "_rev" : "238461229", 
           "isCapital" : false, 
           "population" : 80000 
         } 
diff --git a/Documentation/Examples/generalGraphPaths.generated b/Documentation/Examples/generalGraphPaths.generated
index ac0a0ca227..d6d560ed20 100644
--- a/Documentation/Examples/generalGraphPaths.generated
+++ b/Documentation/Examples/generalGraphPaths.generated
@@ -8,7 +8,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "229239131", 
+          "_rev" : "228696365", 
           "name" : "Diana" 
         } 
       ], 
@@ -16,13 +16,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "229239131", 
+        "_rev" : "228696365", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "229239131", 
+        "_rev" : "228696365", 
         "name" : "Diana" 
       } 
     }, 
@@ -31,7 +31,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "228518235", 
+          "_rev" : "227975469", 
           "name" : "Alice" 
         } 
       ], 
@@ -39,13 +39,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "228518235", 
+        "_rev" : "227975469", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "228518235", 
+        "_rev" : "227975469", 
         "name" : "Alice" 
       } 
     }, 
@@ -54,13 +54,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "228518235", 
+          "_rev" : "227975469", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "228845915", 
+          "_rev" : "228303149", 
           "name" : "Bob" 
         } 
       ], 
@@ -68,7 +68,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "229566811", 
+          "_rev" : "229024045", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -77,13 +77,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "228518235", 
+        "_rev" : "227975469", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "228845915", 
+        "_rev" : "228303149", 
         "name" : "Bob" 
       } 
     }, 
@@ -92,19 +92,19 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "228518235", 
+          "_rev" : "227975469", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "228845915", 
+          "_rev" : "228303149", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "229239131", 
+          "_rev" : "228696365", 
           "name" : "Diana" 
         } 
       ], 
@@ -112,7 +112,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "229566811", 
+          "_rev" : "229024045", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -120,7 +120,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "relation/bobAndDiana", 
           "_key" : "bobAndDiana", 
-          "_rev" : "230222171", 
+          "_rev" : "229679405", 
           "_from" : "male/bob", 
           "_to" : "female/diana", 
           "type" : "friend" 
@@ -129,13 +129,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "228518235", 
+        "_rev" : "227975469", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "229239131", 
+        "_rev" : "228696365", 
         "name" : "Diana" 
       } 
     }, 
@@ -144,13 +144,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "228518235", 
+          "_rev" : "227975469", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "229042523", 
+          "_rev" : "228499757", 
           "name" : "Charly" 
         } 
       ], 
@@ -158,7 +158,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "229828955", 
+          "_rev" : "229286189", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -167,13 +167,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "228518235", 
+        "_rev" : "227975469", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "229042523", 
+        "_rev" : "228499757", 
         "name" : "Charly" 
       } 
     }, 
@@ -182,19 +182,19 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "228518235", 
+          "_rev" : "227975469", 
           "name" : "Alice" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "229042523", 
+          "_rev" : "228499757", 
           "name" : "Charly" 
         }, 
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "229239131", 
+          "_rev" : "228696365", 
           "name" : "Diana" 
         } 
       ], 
@@ -202,7 +202,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "229828955", 
+          "_rev" : "229286189", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -210,7 +210,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "relation/charlyAndDiana", 
           "_key" : "charlyAndDiana", 
-          "_rev" : "230025563", 
+          "_rev" : "229482797", 
           "_from" : "male/charly", 
           "_to" : "female/diana", 
           "type" : "married" 
@@ -219,13 +219,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "228518235", 
+        "_rev" : "227975469", 
         "name" : "Alice" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "229239131", 
+        "_rev" : "228696365", 
         "name" : "Diana" 
       } 
     }, 
@@ -234,7 +234,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "228845915", 
+          "_rev" : "228303149", 
           "name" : "Bob" 
         } 
       ], 
@@ -242,13 +242,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "228845915", 
+        "_rev" : "228303149", 
         "name" : "Bob" 
       }, 
       "destination" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "228845915", 
+        "_rev" : "228303149", 
         "name" : "Bob" 
       } 
     }, 
@@ -257,13 +257,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "228845915", 
+          "_rev" : "228303149", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "229239131", 
+          "_rev" : "228696365", 
           "name" : "Diana" 
         } 
       ], 
@@ -271,7 +271,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "relation/bobAndDiana", 
           "_key" : "bobAndDiana", 
-          "_rev" : "230222171", 
+          "_rev" : "229679405", 
           "_from" : "male/bob", 
           "_to" : "female/diana", 
           "type" : "friend" 
@@ -280,13 +280,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "228845915", 
+        "_rev" : "228303149", 
         "name" : "Bob" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "229239131", 
+        "_rev" : "228696365", 
         "name" : "Diana" 
       } 
     }, 
@@ -295,7 +295,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "229042523", 
+          "_rev" : "228499757", 
           "name" : "Charly" 
         } 
       ], 
@@ -303,13 +303,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "229042523", 
+        "_rev" : "228499757", 
         "name" : "Charly" 
       }, 
       "destination" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "229042523", 
+        "_rev" : "228499757", 
         "name" : "Charly" 
       } 
     }, 
@@ -318,13 +318,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "229042523", 
+          "_rev" : "228499757", 
           "name" : "Charly" 
         }, 
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "229239131", 
+          "_rev" : "228696365", 
           "name" : "Diana" 
         } 
       ], 
@@ -332,7 +332,7 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
         { 
           "_id" : "relation/charlyAndDiana", 
           "_key" : "charlyAndDiana", 
-          "_rev" : "230025563", 
+          "_rev" : "229482797", 
           "_from" : "male/charly", 
           "_to" : "female/diana", 
           "type" : "married" 
@@ -341,13 +341,13 @@ arangosh> db._query("RETURN GRAPH_PATHS('social')").toArray();
       "source" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "229042523", 
+        "_rev" : "228499757", 
         "name" : "Charly" 
       }, 
       "destination" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "229239131", 
+        "_rev" : "228696365", 
         "name" : "Diana" 
       } 
     } 
diff --git a/Documentation/Examples/generalGraphPaths2.generated b/Documentation/Examples/generalGraphPaths2.generated
index c4f8cfa1e4..2d6bc3ce66 100644
--- a/Documentation/Examples/generalGraphPaths2.generated
+++ b/Documentation/Examples/generalGraphPaths2.generated
@@ -10,13 +10,13 @@ arangosh> db._query(
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "700246363", 
+          "_rev" : "698130733", 
           "name" : "Diana" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "700049755", 
+          "_rev" : "697934125", 
           "name" : "Charly" 
         } 
       ], 
@@ -24,7 +24,7 @@ arangosh> db._query(
         { 
           "_id" : "relation/charlyAndDiana", 
           "_key" : "charlyAndDiana", 
-          "_rev" : "701032795", 
+          "_rev" : "698917165", 
           "_from" : "male/charly", 
           "_to" : "female/diana", 
           "type" : "married" 
@@ -33,13 +33,13 @@ arangosh> db._query(
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "700246363", 
+        "_rev" : "698130733", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "700049755", 
+        "_rev" : "697934125", 
         "name" : "Charly" 
       } 
     }, 
@@ -48,19 +48,19 @@ arangosh> db._query(
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "700246363", 
+          "_rev" : "698130733", 
           "name" : "Diana" 
         }, 
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "700049755", 
+          "_rev" : "697934125", 
           "name" : "Charly" 
         }, 
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "699525467", 
+          "_rev" : "697409837", 
           "name" : "Alice" 
         } 
       ], 
@@ -68,7 +68,7 @@ arangosh> db._query(
         { 
           "_id" : "relation/charlyAndDiana", 
           "_key" : "charlyAndDiana", 
-          "_rev" : "701032795", 
+          "_rev" : "698917165", 
           "_from" : "male/charly", 
           "_to" : "female/diana", 
           "type" : "married" 
@@ -76,7 +76,7 @@ arangosh> db._query(
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "700836187", 
+          "_rev" : "698720557", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -85,13 +85,13 @@ arangosh> db._query(
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "700246363", 
+        "_rev" : "698130733", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "699525467", 
+        "_rev" : "697409837", 
         "name" : "Alice" 
       } 
     }, 
@@ -100,13 +100,13 @@ arangosh> db._query(
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "700246363", 
+          "_rev" : "698130733", 
           "name" : "Diana" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "699853147", 
+          "_rev" : "697737517", 
           "name" : "Bob" 
         } 
       ], 
@@ -114,7 +114,7 @@ arangosh> db._query(
         { 
           "_id" : "relation/bobAndDiana", 
           "_key" : "bobAndDiana", 
-          "_rev" : "701229403", 
+          "_rev" : "699113773", 
           "_from" : "male/bob", 
           "_to" : "female/diana", 
           "type" : "friend" 
@@ -123,13 +123,13 @@ arangosh> db._query(
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "700246363", 
+        "_rev" : "698130733", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "699853147", 
+        "_rev" : "697737517", 
         "name" : "Bob" 
       } 
     }, 
@@ -138,19 +138,19 @@ arangosh> db._query(
         { 
           "_id" : "female/diana", 
           "_key" : "diana", 
-          "_rev" : "700246363", 
+          "_rev" : "698130733", 
           "name" : "Diana" 
         }, 
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "699853147", 
+          "_rev" : "697737517", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "699525467", 
+          "_rev" : "697409837", 
           "name" : "Alice" 
         } 
       ], 
@@ -158,7 +158,7 @@ arangosh> db._query(
         { 
           "_id" : "relation/bobAndDiana", 
           "_key" : "bobAndDiana", 
-          "_rev" : "701229403", 
+          "_rev" : "699113773", 
           "_from" : "male/bob", 
           "_to" : "female/diana", 
           "type" : "friend" 
@@ -166,7 +166,7 @@ arangosh> db._query(
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "700574043", 
+          "_rev" : "698458413", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -175,13 +175,13 @@ arangosh> db._query(
       "source" : { 
         "_id" : "female/diana", 
         "_key" : "diana", 
-        "_rev" : "700246363", 
+        "_rev" : "698130733", 
         "name" : "Diana" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "699525467", 
+        "_rev" : "697409837", 
         "name" : "Alice" 
       } 
     }, 
@@ -190,13 +190,13 @@ arangosh> db._query(
         { 
           "_id" : "male/bob", 
           "_key" : "bob", 
-          "_rev" : "699853147", 
+          "_rev" : "697737517", 
           "name" : "Bob" 
         }, 
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "699525467", 
+          "_rev" : "697409837", 
           "name" : "Alice" 
         } 
       ], 
@@ -204,7 +204,7 @@ arangosh> db._query(
         { 
           "_id" : "relation/aliceAndBob", 
           "_key" : "aliceAndBob", 
-          "_rev" : "700574043", 
+          "_rev" : "698458413", 
           "_from" : "female/alice", 
           "_to" : "male/bob", 
           "type" : "married" 
@@ -213,13 +213,13 @@ arangosh> db._query(
       "source" : { 
         "_id" : "male/bob", 
         "_key" : "bob", 
-        "_rev" : "699853147", 
+        "_rev" : "697737517", 
         "name" : "Bob" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "699525467", 
+        "_rev" : "697409837", 
         "name" : "Alice" 
       } 
     }, 
@@ -228,13 +228,13 @@ arangosh> db._query(
         { 
           "_id" : "male/charly", 
           "_key" : "charly", 
-          "_rev" : "700049755", 
+          "_rev" : "697934125", 
           "name" : "Charly" 
         }, 
         { 
           "_id" : "female/alice", 
           "_key" : "alice", 
-          "_rev" : "699525467", 
+          "_rev" : "697409837", 
           "name" : "Alice" 
         } 
       ], 
@@ -242,7 +242,7 @@ arangosh> db._query(
         { 
           "_id" : "relation/aliceAndCharly", 
           "_key" : "aliceAndCharly", 
-          "_rev" : "700836187", 
+          "_rev" : "698720557", 
           "_from" : "female/alice", 
           "_to" : "male/charly", 
           "type" : "friend" 
@@ -251,13 +251,13 @@ arangosh> db._query(
       "source" : { 
         "_id" : "male/charly", 
         "_key" : "charly", 
-        "_rev" : "700049755", 
+        "_rev" : "697934125", 
         "name" : "Charly" 
       }, 
       "destination" : { 
         "_id" : "female/alice", 
         "_key" : "alice", 
-        "_rev" : "699525467", 
+        "_rev" : "697409837", 
         "name" : "Alice" 
       } 
     } 
diff --git a/Documentation/Examples/generalGraphShortestPaths1.generated b/Documentation/Examples/generalGraphShortestPaths1.generated
index 0fd7e351e4..916812c005 100644
--- a/Documentation/Examples/generalGraphShortestPaths1.generated
+++ b/Documentation/Examples/generalGraphShortestPaths1.generated
@@ -7,6 +7,30 @@ arangosh> db._query("FOR e IN GRAPH_SHORTEST_PATH("
 ........> "e.distance, LENGTH(e.paths)]"
 ........> ).toArray();
 [ 
+  [ 
+    "germanCity/Hamburg", 
+    "frenchCity/Paris", 
+    900, 
+    1 
+  ], 
+  [ 
+    "germanCity/Hamburg", 
+    "frenchCity/Lyon", 
+    1200, 
+    1 
+  ], 
+  [ 
+    "germanCity/Cologne", 
+    "frenchCity/Lyon", 
+    700, 
+    1 
+  ], 
+  [ 
+    "germanCity/Cologne", 
+    "frenchCity/Paris", 
+    550, 
+    1 
+  ], 
   [ 
     "germanCity/Berlin", 
     "frenchCity/Paris", 
@@ -18,29 +42,5 @@ arangosh> db._query("FOR e IN GRAPH_SHORTEST_PATH("
     "frenchCity/Lyon", 
     1100, 
     1 
-  ], 
-  [ 
-    "germanCity/Cologne", 
-    "frenchCity/Paris", 
-    550, 
-    1 
-  ], 
-  [ 
-    "germanCity/Cologne", 
-    "frenchCity/Lyon", 
-    700, 
-    1 
-  ], 
-  [ 
-    "germanCity/Hamburg", 
-    "frenchCity/Lyon", 
-    1200, 
-    1 
-  ], 
-  [ 
-    "germanCity/Hamburg", 
-    "frenchCity/Paris", 
-    900, 
-    1 
   ] 
 ]
diff --git a/Documentation/Examples/generalGraphTraversal1.generated b/Documentation/Examples/generalGraphTraversal1.generated
index a195c1aa7c..e08ec700d7 100644
--- a/Documentation/Examples/generalGraphTraversal1.generated
+++ b/Documentation/Examples/generalGraphTraversal1.generated
@@ -9,7 +9,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "germanCity/Hamburg", 
         "_key" : "Hamburg", 
-        "_rev" : "993716571", 
+        "_rev" : "991600941", 
         "isCapital" : false, 
         "population" : 1000000 
       } 
@@ -18,7 +18,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "germanCity/Cologne", 
         "_key" : "Cologne", 
-        "_rev" : "993519963", 
+        "_rev" : "991404333", 
         "isCapital" : false, 
         "population" : 1000000 
       } 
@@ -27,7 +27,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "994109787", 
+        "_rev" : "991994157", 
         "isCapital" : false, 
         "population" : 80000 
       } 
@@ -36,7 +36,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "frenchCity/Paris", 
         "_key" : "Paris", 
-        "_rev" : "994306395", 
+        "_rev" : "992190765", 
         "isCapital" : true, 
         "population" : 4000000 
       } 
@@ -45,7 +45,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "994109787", 
+        "_rev" : "991994157", 
         "isCapital" : false, 
         "population" : 80000 
       } 
@@ -54,7 +54,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "frenchCity/Paris", 
         "_key" : "Paris", 
-        "_rev" : "994306395", 
+        "_rev" : "992190765", 
         "isCapital" : true, 
         "population" : 4000000 
       } 
@@ -63,7 +63,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "994109787", 
+        "_rev" : "991994157", 
         "isCapital" : false, 
         "population" : 80000 
       } 
@@ -72,7 +72,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "994109787", 
+        "_rev" : "991994157", 
         "isCapital" : false, 
         "population" : 80000 
       } 
diff --git a/Documentation/Examples/generalGraphTraversal2.generated b/Documentation/Examples/generalGraphTraversal2.generated
index 6f124683db..2de447cf23 100644
--- a/Documentation/Examples/generalGraphTraversal2.generated
+++ b/Documentation/Examples/generalGraphTraversal2.generated
@@ -9,7 +9,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "germanCity/Hamburg", 
         "_key" : "Hamburg", 
-        "_rev" : "307882331", 
+        "_rev" : "303997229", 
         "isCapital" : false, 
         "population" : 1000000 
       } 
@@ -18,7 +18,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "germanCity/Cologne", 
         "_key" : "Cologne", 
-        "_rev" : "307685723", 
+        "_rev" : "303800621", 
         "isCapital" : false, 
         "population" : 1000000 
       } 
@@ -27,7 +27,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "frenchCity/Paris", 
         "_key" : "Paris", 
-        "_rev" : "308472155", 
+        "_rev" : "304587053", 
         "isCapital" : true, 
         "population" : 4000000 
       } 
@@ -36,7 +36,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL('routeplanner', 'germanCity/Hambur
       "vertex" : { 
         "_id" : "frenchCity/Lyon", 
         "_key" : "Lyon", 
-        "_rev" : "308275547", 
+        "_rev" : "304390445", 
         "isCapital" : false, 
         "population" : 80000 
       } 
diff --git a/Documentation/Examples/generalGraphTraversalTree1.generated b/Documentation/Examples/generalGraphTraversalTree1.generated
index 4e45f4aa55..246a688adf 100644
--- a/Documentation/Examples/generalGraphTraversalTree1.generated
+++ b/Documentation/Examples/generalGraphTraversalTree1.generated
@@ -9,35 +9,35 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL_TREE('routeplanner', 'germanCity/H
       { 
         "_id" : "germanCity/Hamburg", 
         "_key" : "Hamburg", 
-        "_rev" : "175958363", 
+        "_rev" : "175808813", 
         "isCapital" : false, 
         "population" : 1000000, 
         "connnection" : [ 
           { 
             "_id" : "germanCity/Cologne", 
             "_key" : "Cologne", 
-            "_rev" : "175761755", 
+            "_rev" : "175612205", 
             "isCapital" : false, 
             "population" : 1000000, 
             "connnection" : [ 
               { 
                 "_id" : "frenchCity/Lyon", 
                 "_key" : "Lyon", 
-                "_rev" : "176351579", 
+                "_rev" : "176202029", 
                 "isCapital" : false, 
                 "population" : 80000 
               }, 
               { 
                 "_id" : "frenchCity/Paris", 
                 "_key" : "Paris", 
-                "_rev" : "176548187", 
+                "_rev" : "176398637", 
                 "isCapital" : true, 
                 "population" : 4000000, 
                 "connnection" : [ 
                   { 
                     "_id" : "frenchCity/Lyon", 
                     "_key" : "Lyon", 
-                    "_rev" : "176351579", 
+                    "_rev" : "176202029", 
                     "isCapital" : false, 
                     "population" : 80000 
                   } 
@@ -48,14 +48,14 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL_TREE('routeplanner', 'germanCity/H
           { 
             "_id" : "frenchCity/Paris", 
             "_key" : "Paris", 
-            "_rev" : "176548187", 
+            "_rev" : "176398637", 
             "isCapital" : true, 
             "population" : 4000000, 
             "connnection" : [ 
               { 
                 "_id" : "frenchCity/Lyon", 
                 "_key" : "Lyon", 
-                "_rev" : "176351579", 
+                "_rev" : "176202029", 
                 "isCapital" : false, 
                 "population" : 80000 
               } 
@@ -64,7 +64,7 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL_TREE('routeplanner', 'germanCity/H
           { 
             "_id" : "frenchCity/Lyon", 
             "_key" : "Lyon", 
-            "_rev" : "176351579", 
+            "_rev" : "176202029", 
             "isCapital" : false, 
             "population" : 80000 
           } 
diff --git a/Documentation/Examples/generalGraphTraversalTree2.generated b/Documentation/Examples/generalGraphTraversalTree2.generated
index 746a0162b3..08c9b3a639 100644
--- a/Documentation/Examples/generalGraphTraversalTree2.generated
+++ b/Documentation/Examples/generalGraphTraversalTree2.generated
@@ -9,28 +9,28 @@ arangosh> db._query("FOR e IN GRAPH_TRAVERSAL_TREE('routeplanner', 'germanCity/H
       { 
         "_id" : "germanCity/Hamburg", 
         "_key" : "Hamburg", 
-        "_rev" : "182053211", 
+        "_rev" : "181903661", 
         "isCapital" : false, 
         "population" : 1000000, 
         "connnection" : [ 
           { 
             "_id" : "germanCity/Cologne", 
             "_key" : "Cologne", 
-            "_rev" : "181856603", 
+            "_rev" : "181707053", 
             "isCapital" : false, 
             "population" : 1000000 
           }, 
           { 
             "_id" : "frenchCity/Paris", 
             "_key" : "Paris", 
-            "_rev" : "182643035", 
+            "_rev" : "182493485", 
             "isCapital" : true, 
             "population" : 4000000 
           }, 
           { 
             "_id" : "frenchCity/Lyon", 
             "_key" : "Lyon", 
-            "_rev" : "182446427", 
+            "_rev" : "182296877", 
             "isCapital" : false, 
             "population" : 80000 
           } 
diff --git a/Documentation/Examples/generalGraphVertexCollectionRemove.generated b/Documentation/Examples/generalGraphVertexCollectionRemove.generated
index d1176d37d9..12c007c635 100644
--- a/Documentation/Examples/generalGraphVertexCollectionRemove.generated
+++ b/Documentation/Examples/generalGraphVertexCollectionRemove.generated
@@ -4,7 +4,7 @@ arangosh> graph.male.save({name: "Kermit", _key: "kermit"});
 { 
   "error" : false, 
   "_id" : "male/kermit", 
-  "_rev" : "805628251", 
+  "_rev" : "802988333", 
   "_key" : "kermit" 
 }
 arangosh> db._exists("male/kermit")
diff --git a/Documentation/Examples/generalGraphVertexCollectionReplace.generated b/Documentation/Examples/generalGraphVertexCollectionReplace.generated
index 84ba81a0cf..c662e7fb2a 100644
--- a/Documentation/Examples/generalGraphVertexCollectionReplace.generated
+++ b/Documentation/Examples/generalGraphVertexCollectionReplace.generated
@@ -4,13 +4,13 @@ arangosh> graph.male.save({neym: "Jon", _key: "john"});
 { 
   "error" : false, 
   "_id" : "male/john", 
-  "_rev" : "584378715", 
+  "_rev" : "582328621", 
   "_key" : "john" 
 }
 arangosh> graph.male.replace("male/john", {name: "John"});
 { 
   "error" : false, 
   "_id" : "male/john", 
-  "_rev" : "584575323", 
+  "_rev" : "582525229", 
   "_key" : "john" 
 }
diff --git a/Documentation/Examples/generalGraphVertexCollectionSave.generated b/Documentation/Examples/generalGraphVertexCollectionSave.generated
index 60c9fb9006..61a69ffbc2 100644
--- a/Documentation/Examples/generalGraphVertexCollectionSave.generated
+++ b/Documentation/Examples/generalGraphVertexCollectionSave.generated
@@ -4,6 +4,6 @@ arangosh> graph.male.save({name: "Floyd", _key: "floyd"});
 { 
   "error" : false, 
   "_id" : "male/floyd", 
-  "_rev" : "676587867", 
+  "_rev" : "674537773", 
   "_key" : "floyd" 
 }
diff --git a/Documentation/Examples/generalGraphVertexCollectionUpdate.generated b/Documentation/Examples/generalGraphVertexCollectionUpdate.generated
index b32622c4c7..604394c3f0 100644
--- a/Documentation/Examples/generalGraphVertexCollectionUpdate.generated
+++ b/Documentation/Examples/generalGraphVertexCollectionUpdate.generated
@@ -4,13 +4,13 @@ arangosh> graph.female.save({name: "Lynda", _key: "linda"});
 { 
   "error" : false, 
   "_id" : "female/linda", 
-  "_rev" : "800254299", 
+  "_rev" : "797614381", 
   "_key" : "linda" 
 }
 arangosh> graph.female.update("female/linda", {name: "Linda", _key: "linda"});
 { 
   "error" : false, 
   "_id" : "female/linda", 
-  "_rev" : "800450907", 
+  "_rev" : "797810989", 
   "_key" : "linda" 
 }
diff --git a/Documentation/Examples/generalGraphVertices1.generated b/Documentation/Examples/generalGraphVertices1.generated
index f4091912ca..5201f641ae 100644
--- a/Documentation/Examples/generalGraphVertices1.generated
+++ b/Documentation/Examples/generalGraphVertices1.generated
@@ -6,35 +6,35 @@ arangosh> db._query("FOR e IN GRAPH_VERTICES("
   { 
     "_id" : "germanCity/Berlin", 
     "_key" : "Berlin", 
-    "_rev" : "548792667", 
+    "_rev" : "546808109", 
     "isCapital" : true, 
     "population" : 3000000 
   }, 
   { 
     "_id" : "germanCity/Hamburg", 
     "_key" : "Hamburg", 
-    "_rev" : "549185883", 
+    "_rev" : "547201325", 
     "isCapital" : false, 
     "population" : 1000000 
   }, 
   { 
     "_id" : "germanCity/Cologne", 
     "_key" : "Cologne", 
-    "_rev" : "548989275", 
+    "_rev" : "547004717", 
     "isCapital" : false, 
     "population" : 1000000 
   }, 
   { 
     "_id" : "frenchCity/Paris", 
     "_key" : "Paris", 
-    "_rev" : "549775707", 
+    "_rev" : "547791149", 
     "isCapital" : true, 
     "population" : 4000000 
   }, 
   { 
     "_id" : "frenchCity/Lyon", 
     "_key" : "Lyon", 
-    "_rev" : "549579099", 
+    "_rev" : "547594541", 
     "isCapital" : false, 
     "population" : 80000 
   } 
diff --git a/Documentation/Examples/generalGraphVertices2.generated b/Documentation/Examples/generalGraphVertices2.generated
index 3987fb2acf..8f708c5d6a 100644
--- a/Documentation/Examples/generalGraphVertices2.generated
+++ b/Documentation/Examples/generalGraphVertices2.generated
@@ -7,21 +7,21 @@ arangosh> db._query("FOR e IN GRAPH_VERTICES("
   { 
     "_id" : "germanCity/Berlin", 
     "_key" : "Berlin", 
-    "_rev" : "542107995", 
+    "_rev" : "540123437", 
     "isCapital" : true, 
     "population" : 3000000 
   }, 
   { 
     "_id" : "germanCity/Hamburg", 
     "_key" : "Hamburg", 
-    "_rev" : "542501211", 
+    "_rev" : "540516653", 
     "isCapital" : false, 
     "population" : 1000000 
   }, 
   { 
     "_id" : "germanCity/Cologne", 
     "_key" : "Cologne", 
-    "_rev" : "542304603", 
+    "_rev" : "540320045", 
     "isCapital" : false, 
     "population" : 1000000 
   } 
diff --git a/Documentation/Examples/generalGraphVerticesFiltered.generated b/Documentation/Examples/generalGraphVerticesFiltered.generated
index 6edcc8b6c0..bf65086a54 100644
--- a/Documentation/Examples/generalGraphVerticesFiltered.generated
+++ b/Documentation/Examples/generalGraphVerticesFiltered.generated
@@ -5,13 +5,13 @@ arangosh> graph._vertices([{name: "Alice"}, {name: "Bob"}]).toArray();
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "661121371", 
+    "_rev" : "659005741", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "661449051", 
+    "_rev" : "659333421", 
     "name" : "Bob" 
   } 
 ]
diff --git a/Documentation/Examples/generalGraphVerticesUnfiltered.generated b/Documentation/Examples/generalGraphVerticesUnfiltered.generated
index a2d05853a3..59f98ccfc8 100644
--- a/Documentation/Examples/generalGraphVerticesUnfiltered.generated
+++ b/Documentation/Examples/generalGraphVerticesUnfiltered.generated
@@ -5,25 +5,25 @@ arangosh> graph._vertices().toArray();
   { 
     "_id" : "female/diana", 
     "_key" : "diana", 
-    "_rev" : "983492955", 
+    "_rev" : "980853037", 
     "name" : "Diana" 
   }, 
   { 
     "_id" : "female/alice", 
     "_key" : "alice", 
-    "_rev" : "982772059", 
+    "_rev" : "980132141", 
     "name" : "Alice" 
   }, 
   { 
     "_id" : "male/bob", 
     "_key" : "bob", 
-    "_rev" : "983099739", 
+    "_rev" : "980459821", 
     "name" : "Bob" 
   }, 
   { 
     "_id" : "male/charly", 
     "_key" : "charly", 
-    "_rev" : "983296347", 
+    "_rev" : "980656429", 
     "name" : "Charly" 
   } 
 ]
diff --git a/Documentation/Examples/general_graph__deleteEdgeDefinition.generated b/Documentation/Examples/general_graph__deleteEdgeDefinition.generated
index 2995cd2661..102eddd5d8 100644
--- a/Documentation/Examples/general_graph__deleteEdgeDefinition.generated
+++ b/Documentation/Examples/general_graph__deleteEdgeDefinition.generated
@@ -4,4 +4,4 @@ arangosh> var ed2 = graph_module._relation("myEC2", ["myVC1"], ["myVC3"]);
 arangosh> var graph = graph_module._create("myGraph", [ed1, ed2]);
 arangosh> graph._deleteEdgeDefinition("myEC1");
 arangosh> db._collection("myEC1");
-[ArangoCollection 640149851, "myEC1" (type edge, status loaded)]
+[ArangoCollection 638034221, "myEC1" (type edge, status loaded)]
diff --git a/Documentation/Examples/queryLimit.generated b/Documentation/Examples/queryLimit.generated
index 6ed079be61..10a9624b11 100644
--- a/Documentation/Examples/queryLimit.generated
+++ b/Documentation/Examples/queryLimit.generated
@@ -1,48 +1,48 @@
 arangosh> db.five.all().toArray();
 [ 
   { 
-    "_id" : "five/516942171", 
-    "_key" : "516942171", 
-    "_rev" : "516942171", 
-    "name" : "two" 
-  }, 
-  { 
-    "_id" : "five/516745563", 
-    "_key" : "516745563", 
-    "_rev" : "516745563", 
-    "name" : "one" 
-  }, 
-  { 
-    "_id" : "five/517531995", 
-    "_key" : "517531995", 
-    "_rev" : "517531995", 
-    "name" : "five" 
-  }, 
-  { 
-    "_id" : "five/517138779", 
-    "_key" : "517138779", 
-    "_rev" : "517138779", 
+    "_id" : "five/515219757", 
+    "_key" : "515219757", 
+    "_rev" : "515219757", 
     "name" : "three" 
   }, 
   { 
-    "_id" : "five/517335387", 
-    "_key" : "517335387", 
-    "_rev" : "517335387", 
+    "_id" : "five/515023149", 
+    "_key" : "515023149", 
+    "_rev" : "515023149", 
+    "name" : "two" 
+  }, 
+  { 
+    "_id" : "five/515612973", 
+    "_key" : "515612973", 
+    "_rev" : "515612973", 
+    "name" : "five" 
+  }, 
+  { 
+    "_id" : "five/515416365", 
+    "_key" : "515416365", 
+    "_rev" : "515416365", 
     "name" : "four" 
+  }, 
+  { 
+    "_id" : "five/514826541", 
+    "_key" : "514826541", 
+    "_rev" : "514826541", 
+    "name" : "one" 
   } 
 ]
 arangosh> db.five.all().limit(2).toArray();
 [ 
   { 
-    "_id" : "five/516942171", 
-    "_key" : "516942171", 
-    "_rev" : "516942171", 
-    "name" : "two" 
+    "_id" : "five/515219757", 
+    "_key" : "515219757", 
+    "_rev" : "515219757", 
+    "name" : "three" 
   }, 
   { 
-    "_id" : "five/516745563", 
-    "_key" : "516745563", 
-    "_rev" : "516745563", 
-    "name" : "one" 
+    "_id" : "five/515023149", 
+    "_key" : "515023149", 
+    "_rev" : "515023149", 
+    "name" : "two" 
   } 
 ]
diff --git a/Documentation/Examples/querySkip.generated b/Documentation/Examples/querySkip.generated
index dba3416795..324d53732f 100644
--- a/Documentation/Examples/querySkip.generated
+++ b/Documentation/Examples/querySkip.generated
@@ -1,48 +1,48 @@
 arangosh> db.five.all().toArray();
 [ 
   { 
-    "_id" : "five/140634459", 
-    "_key" : "140634459", 
-    "_rev" : "140634459", 
-    "name" : "three" 
-  }, 
-  { 
-    "_id" : "five/141027675", 
-    "_key" : "141027675", 
-    "_rev" : "141027675", 
-    "name" : "five" 
-  }, 
-  { 
-    "_id" : "five/140241243", 
-    "_key" : "140241243", 
-    "_rev" : "140241243", 
+    "_id" : "five/140157229", 
+    "_key" : "140157229", 
+    "_rev" : "140157229", 
     "name" : "one" 
   }, 
   { 
-    "_id" : "five/140437851", 
-    "_key" : "140437851", 
-    "_rev" : "140437851", 
+    "_id" : "five/140747053", 
+    "_key" : "140747053", 
+    "_rev" : "140747053", 
+    "name" : "four" 
+  }, 
+  { 
+    "_id" : "five/140550445", 
+    "_key" : "140550445", 
+    "_rev" : "140550445", 
+    "name" : "three" 
+  }, 
+  { 
+    "_id" : "five/140353837", 
+    "_key" : "140353837", 
+    "_rev" : "140353837", 
     "name" : "two" 
   }, 
   { 
-    "_id" : "five/140831067", 
-    "_key" : "140831067", 
-    "_rev" : "140831067", 
-    "name" : "four" 
+    "_id" : "five/140943661", 
+    "_key" : "140943661", 
+    "_rev" : "140943661", 
+    "name" : "five" 
   } 
 ]
 arangosh> db.five.all().skip(3).toArray();
 [ 
   { 
-    "_id" : "five/140437851", 
-    "_key" : "140437851", 
-    "_rev" : "140437851", 
+    "_id" : "five/140353837", 
+    "_key" : "140353837", 
+    "_rev" : "140353837", 
     "name" : "two" 
   }, 
   { 
-    "_id" : "five/140831067", 
-    "_key" : "140831067", 
-    "_rev" : "140831067", 
-    "name" : "four" 
+    "_id" : "five/140943661", 
+    "_key" : "140943661", 
+    "_rev" : "140943661", 
+    "name" : "five" 
   } 
 ]
diff --git a/VERSION b/VERSION
index 55092c1ee4..dcb62b0769 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.0-alpha5
+2.5.0-alpha6
diff --git a/build.h b/build.h
index b1f5d52a6e..33ccaa0480 100644
--- a/build.h
+++ b/build.h
@@ -1 +1 @@
-#define TRI_VERSION "2.5.0-alpha5"
+#define TRI_VERSION "2.5.0-alpha6"
diff --git a/configure b/configure
index 3647c99463..ab4775fce2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for triAGENS ArangoDB 2.5.0-alpha5.
+# Generated by GNU Autoconf 2.69 for triAGENS ArangoDB 2.5.0-alpha6.
 #
 # Report bugs to <info@arangodb.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='triAGENS ArangoDB'
 PACKAGE_TARNAME='arangodb'
-PACKAGE_VERSION='2.5.0-alpha5'
-PACKAGE_STRING='triAGENS ArangoDB 2.5.0-alpha5'
+PACKAGE_VERSION='2.5.0-alpha6'
+PACKAGE_STRING='triAGENS ArangoDB 2.5.0-alpha6'
 PACKAGE_BUGREPORT='info@arangodb.com'
 PACKAGE_URL='https://www.arangodb.com'
 
@@ -1406,7 +1406,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures triAGENS ArangoDB 2.5.0-alpha5 to adapt to many kinds of systems.
+\`configure' configures triAGENS ArangoDB 2.5.0-alpha6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1477,7 +1477,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of triAGENS ArangoDB 2.5.0-alpha5:";;
+     short | recursive ) echo "Configuration of triAGENS ArangoDB 2.5.0-alpha6:";;
    esac
   cat <<\_ACEOF
 
@@ -1606,7 +1606,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-triAGENS ArangoDB configure 2.5.0-alpha5
+triAGENS ArangoDB configure 2.5.0-alpha6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2138,7 +2138,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by triAGENS ArangoDB $as_me 2.5.0-alpha5, which was
+It was created by triAGENS ArangoDB $as_me 2.5.0-alpha6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3382,7 +3382,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='arangodb'
- VERSION='2.5.0-alpha5'
+ VERSION='2.5.0-alpha6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9177,7 +9177,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by triAGENS ArangoDB $as_me 2.5.0-alpha5, which was
+This file was extended by triAGENS ArangoDB $as_me 2.5.0-alpha6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9244,7 +9244,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-triAGENS ArangoDB config.status 2.5.0-alpha5
+triAGENS ArangoDB config.status 2.5.0-alpha6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index e64f336220..8429c69543 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl ============================================================================
 dnl --SECTION--                                  triAGENS GmbH Build Environment
 dnl ============================================================================
 
-AC_INIT([triAGENS ArangoDB], [2.5.0-alpha5], [info@arangodb.com], [arangodb], [https://www.arangodb.com])
+AC_INIT([triAGENS ArangoDB], [2.5.0-alpha6], [info@arangodb.com], [arangodb], [https://www.arangodb.com])
 
 dnl ----------------------------------------------------------------------------
 dnl auxillary directory for install-sh and missing