diff --git a/java/server/src/main/java/org/softwareheritage/graph/Node.java b/java/server/src/main/java/org/softwareheritage/graph/Node.java
--- a/java/server/src/main/java/org/softwareheritage/graph/Node.java
+++ b/java/server/src/main/java/org/softwareheritage/graph/Node.java
@@ -22,6 +22,8 @@
     CNT,
     /** Directory node */
     DIR,
+    /** Origin node */
+    ORI,
     /** Release node */
     REL,
     /** Revision node */
@@ -43,10 +45,12 @@
         case 1:
           return DIR;
         case 2:
-          return REL;
+          return ORI;
         case 3:
-          return REV;
+          return REL;
         case 4:
+          return REV;
+        case 5:
           return SNP;
       }
       return null;
@@ -60,6 +64,9 @@
      * @see org.softwareheritage.graph.Node.Type
      */
     public static Node.Type fromStr(String strType) {
+      if (!strType.matches("cnt|dir|ori|rel|rev|snp")) {
+        throw new IllegalArgumentException("Unknown node type: " + strType);
+      }
       return Node.Type.valueOf(strType.toUpperCase());
     }
 
diff --git a/java/server/src/main/java/org/softwareheritage/graph/SwhId.java b/java/server/src/main/java/org/softwareheritage/graph/SwhId.java
--- a/java/server/src/main/java/org/softwareheritage/graph/SwhId.java
+++ b/java/server/src/main/java/org/softwareheritage/graph/SwhId.java
@@ -39,11 +39,7 @@
       throw new IllegalArgumentException("Expected SWH ID format to be 'swh:1:type:hash', got: " + swhId);
     }
 
-    String type = parts[2];
-    if (!type.matches("cnt|dir|rel|rev|snp")) {
-      throw new IllegalArgumentException("Unknown SWH ID type in: " + swhId);
-    }
-    this.type = Node.Type.fromStr(type);
+    this.type = Node.Type.fromStr(parts[2]);
 
     this.hash = parts[3];
     if (!hash.matches("[0-9a-f]{" + HASH_LENGTH + "}")) {
diff --git a/java/server/src/test/dataset/example.edges.csv b/java/server/src/test/dataset/example.edges.csv
--- a/java/server/src/test/dataset/example.edges.csv
+++ b/java/server/src/test/dataset/example.edges.csv
@@ -20,3 +20,4 @@
 swh:1:rel:0000000000000000000000000000000000000019 swh:1:rev:0000000000000000000000000000000000000018
 swh:1:snp:0000000000000000000000000000000000000020 swh:1:rev:0000000000000000000000000000000000000009
 swh:1:snp:0000000000000000000000000000000000000020 swh:1:rel:0000000000000000000000000000000000000010
+swh:1:ori:0000000000000000000000000000000000000021 swh:1:snp:0000000000000000000000000000000000000020
diff --git a/java/server/src/test/dataset/img/example.dot b/java/server/src/test/dataset/img/example.dot
--- a/java/server/src/test/dataset/img/example.dot
+++ b/java/server/src/test/dataset/img/example.dot
@@ -71,4 +71,12 @@
         20 -> 09;
         20 -> 10;
     }
+
+    subgraph cluster_ori {
+        label="Origins";
+        node [shape=egg];
+        21 [label="ori:0x21"];
+
+        21 -> 20;
+    }
 }
diff --git a/java/server/src/test/dataset/output/example-transposed.graph b/java/server/src/test/dataset/output/example-transposed.graph
--- a/java/server/src/test/dataset/output/example-transposed.graph
+++ b/java/server/src/test/dataset/output/example-transposed.graph
@@ -1 +1 @@
-®—I¯'ÉâR_?¢REïîJI­ñ5Ü
\ No newline at end of file
+[:é5Ñ5YK¦ë+Çä_&¼Nº]/W«¥Ü
\ No newline at end of file
diff --git a/java/server/src/test/dataset/output/example-transposed.obl b/java/server/src/test/dataset/output/example-transposed.obl
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/java/server/src/test/dataset/output/example-transposed.offsets b/java/server/src/test/dataset/output/example-transposed.offsets
--- a/java/server/src/test/dataset/output/example-transposed.offsets
+++ b/java/server/src/test/dataset/output/example-transposed.offsets
@@ -1 +1,2 @@
-¡BŽ(áa‚†Œ8aƊ8¤
\ No newline at end of file
+ŽqAqA
CEQСB…
+€
\ No newline at end of file
diff --git a/java/server/src/test/dataset/output/example-transposed.properties b/java/server/src/test/dataset/output/example-transposed.properties
--- a/java/server/src/test/dataset/output/example-transposed.properties
+++ b/java/server/src/test/dataset/output/example-transposed.properties
@@ -1,35 +1,35 @@
 #BVGraph properties
-#Thu Jul 11 10:00:30 GMT 2019
-bitsforreferences=27
-avgbitsforintervals=0.5
+#Mon Jul 29 09:58:01 GMT 2019
+bitsforreferences=23
+avgbitsforintervals=0.762
 graphclass=it.unimi.dsi.big.webgraph.BVGraph
-avgdist=0.45
-successoravggap=4.955
-residualexpstats=4,3,5,2
-arcs=22
+avgdist=0.19
+successoravggap=5.891
+residualexpstats=8,5,3,0,2,1
+arcs=23
 minintervallength=4
-bitsforoutdegrees=58
-residualavgloggap=2.1579982668876947
-avgbitsforoutdegrees=2.9
-bitsforresiduals=60
-successoravgloggap=2.3575375071412092
+bitsforoutdegrees=61
+residualavgloggap=2.1035487523752026
+avgbitsforoutdegrees=2.905
+bitsforresiduals=86
+successoravgloggap=2.08748530092112
 maxrefcount=3
-successorexpstats=4,4,11,3
-residualarcs=14
-avgbitsforresiduals=3
-avgbitsforblocks=1.35
+successorexpstats=8,7,5,1,1,1
+residualarcs=19
+avgbitsforresiduals=4.095
+avgbitsforblocks=0.19
 windowsize=7
-residualavggap=4.429
-copiedarcs=8
-avgbitsforreferences=1.35
+residualavggap=6.921
+copiedarcs=4
+avgbitsforreferences=1.095
 version=0
-compratio=1.541
-bitsperlink=8.364
+compratio=1.515
+bitsperlink=8.348
 compressionflags=
-nodes=20
-avgref=0.45
+nodes=21
+avgref=0.19
 zetak=3
-bitsforintervals=10
+bitsforintervals=16
 intervalisedarcs=0
-bitspernode=9.2
-bitsforblocks=27
+bitspernode=9.143
+bitsforblocks=4
diff --git a/java/server/src/test/dataset/output/example.graph b/java/server/src/test/dataset/output/example.graph
--- a/java/server/src/test/dataset/output/example.graph
+++ b/java/server/src/test/dataset/output/example.graph
@@ -1 +1 @@
-]¾ãö?å~ÿÚ“ù¿bûZÃz
\ No newline at end of file
+}Êîû‹Ò{"îývõDiJÏoXDöeÐ
\ No newline at end of file
diff --git a/java/server/src/test/dataset/output/example.mph b/java/server/src/test/dataset/output/example.mph
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/java/server/src/test/dataset/output/example.nodeToSwhMap.csv b/java/server/src/test/dataset/output/example.node2pid.csv
rename from java/server/src/test/dataset/output/example.nodeToSwhMap.csv
rename to java/server/src/test/dataset/output/example.node2pid.csv
--- a/java/server/src/test/dataset/output/example.nodeToSwhMap.csv
+++ b/java/server/src/test/dataset/output/example.node2pid.csv
@@ -1,20 +1,21 @@
-swh:1:rel:0000000000000000000000000000000000000019
-swh:1:rev:0000000000000000000000000000000000000018
 swh:1:dir:0000000000000000000000000000000000000017
-swh:1:rev:0000000000000000000000000000000000000013
 swh:1:cnt:0000000000000000000000000000000000000014
 swh:1:dir:0000000000000000000000000000000000000016
-swh:1:rev:0000000000000000000000000000000000000009
-swh:1:dir:0000000000000000000000000000000000000012
 swh:1:cnt:0000000000000000000000000000000000000015
-swh:1:dir:0000000000000000000000000000000000000008
+swh:1:rev:0000000000000000000000000000000000000009
 swh:1:rev:0000000000000000000000000000000000000003
-swh:1:cnt:0000000000000000000000000000000000000011
+swh:1:dir:0000000000000000000000000000000000000008
+swh:1:dir:0000000000000000000000000000000000000002
 swh:1:cnt:0000000000000000000000000000000000000001
-swh:1:cnt:0000000000000000000000000000000000000007
 swh:1:dir:0000000000000000000000000000000000000006
-swh:1:dir:0000000000000000000000000000000000000002
-swh:1:cnt:0000000000000000000000000000000000000004
+swh:1:cnt:0000000000000000000000000000000000000007
 swh:1:cnt:0000000000000000000000000000000000000005
-swh:1:rel:0000000000000000000000000000000000000010
+swh:1:cnt:0000000000000000000000000000000000000004
+swh:1:ori:0000000000000000000000000000000000000021
 swh:1:snp:0000000000000000000000000000000000000020
+swh:1:rel:0000000000000000000000000000000000000010
+swh:1:cnt:0000000000000000000000000000000000000011
+swh:1:rev:0000000000000000000000000000000000000013
+swh:1:dir:0000000000000000000000000000000000000012
+swh:1:rev:0000000000000000000000000000000000000018
+swh:1:rel:0000000000000000000000000000000000000019
diff --git a/java/server/src/test/dataset/output/example.node2type.map b/java/server/src/test/dataset/output/example.node2type.map
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/java/server/src/test/dataset/output/example.obl b/java/server/src/test/dataset/output/example.obl
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/java/server/src/test/dataset/output/example.offsets b/java/server/src/test/dataset/output/example.offsets
--- a/java/server/src/test/dataset/output/example.offsets
+++ b/java/server/src/test/dataset/output/example.offsets
@@ -1 +1 @@
-Š4j4r	
I
á€
\ No newline at end of file
+BÑA!HjHPTb
diff --git a/java/server/src/test/dataset/output/example.order b/java/server/src/test/dataset/output/example.order
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/java/server/src/test/dataset/output/example.swhToNodeMap.csv b/java/server/src/test/dataset/output/example.pid2node.csv
rename from java/server/src/test/dataset/output/example.swhToNodeMap.csv
rename to java/server/src/test/dataset/output/example.pid2node.csv
--- a/java/server/src/test/dataset/output/example.swhToNodeMap.csv
+++ b/java/server/src/test/dataset/output/example.pid2node.csv
@@ -1,20 +1,21 @@
-swh:1:cnt:0000000000000000000000000000000000000001 00000000000000000012
-swh:1:cnt:0000000000000000000000000000000000000004 00000000000000000016
-swh:1:cnt:0000000000000000000000000000000000000005 00000000000000000017
-swh:1:cnt:0000000000000000000000000000000000000007 00000000000000000013
-swh:1:cnt:0000000000000000000000000000000000000011 00000000000000000011
-swh:1:cnt:0000000000000000000000000000000000000014 00000000000000000004
-swh:1:cnt:0000000000000000000000000000000000000015 00000000000000000008
-swh:1:dir:0000000000000000000000000000000000000002 00000000000000000015
-swh:1:dir:0000000000000000000000000000000000000006 00000000000000000014
-swh:1:dir:0000000000000000000000000000000000000008 00000000000000000009
-swh:1:dir:0000000000000000000000000000000000000012 00000000000000000007
-swh:1:dir:0000000000000000000000000000000000000016 00000000000000000005
-swh:1:dir:0000000000000000000000000000000000000017 00000000000000000002
-swh:1:rel:0000000000000000000000000000000000000010 00000000000000000018
-swh:1:rel:0000000000000000000000000000000000000019 00000000000000000000
-swh:1:rev:0000000000000000000000000000000000000003 00000000000000000010
-swh:1:rev:0000000000000000000000000000000000000009 00000000000000000006
-swh:1:rev:0000000000000000000000000000000000000013 00000000000000000003
-swh:1:rev:0000000000000000000000000000000000000018 00000000000000000001
-swh:1:snp:0000000000000000000000000000000000000020 00000000000000000019
+swh:1:cnt:0000000000000000000000000000000000000001 00000000000000000008
+swh:1:cnt:0000000000000000000000000000000000000004 00000000000000000012
+swh:1:cnt:0000000000000000000000000000000000000005 00000000000000000011
+swh:1:cnt:0000000000000000000000000000000000000007 00000000000000000010
+swh:1:cnt:0000000000000000000000000000000000000011 00000000000000000016
+swh:1:cnt:0000000000000000000000000000000000000014 00000000000000000001
+swh:1:cnt:0000000000000000000000000000000000000015 00000000000000000003
+swh:1:dir:0000000000000000000000000000000000000002 00000000000000000007
+swh:1:dir:0000000000000000000000000000000000000006 00000000000000000009
+swh:1:dir:0000000000000000000000000000000000000008 00000000000000000006
+swh:1:dir:0000000000000000000000000000000000000012 00000000000000000018
+swh:1:dir:0000000000000000000000000000000000000016 00000000000000000002
+swh:1:dir:0000000000000000000000000000000000000017 00000000000000000000
+swh:1:ori:0000000000000000000000000000000000000021 00000000000000000013
+swh:1:rel:0000000000000000000000000000000000000010 00000000000000000015
+swh:1:rel:0000000000000000000000000000000000000019 00000000000000000020
+swh:1:rev:0000000000000000000000000000000000000003 00000000000000000005
+swh:1:rev:0000000000000000000000000000000000000009 00000000000000000004
+swh:1:rev:0000000000000000000000000000000000000013 00000000000000000017
+swh:1:rev:0000000000000000000000000000000000000018 00000000000000000019
+swh:1:snp:0000000000000000000000000000000000000020 00000000000000000014
diff --git a/java/server/src/test/dataset/output/example.properties b/java/server/src/test/dataset/output/example.properties
--- a/java/server/src/test/dataset/output/example.properties
+++ b/java/server/src/test/dataset/output/example.properties
@@ -1,35 +1,35 @@
 #BVGraph properties
-#Thu Jul 11 10:00:28 GMT 2019
-bitsforreferences=14
-avgbitsforintervals=0.65
+#Mon Jul 29 09:57:59 GMT 2019
+bitsforreferences=17
+avgbitsforintervals=0.619
 graphclass=it.unimi.dsi.big.webgraph.BVGraph
-avgdist=0.05
-successoravggap=5.841
-residualexpstats=8,3,8,1,1
-arcs=22
+avgdist=0.143
+successoravggap=10.196
+residualexpstats=6,6,3,2,3,1
+arcs=23
 minintervallength=4
-bitsforoutdegrees=48
-residualavgloggap=2.061149930723404
-avgbitsforoutdegrees=2.4
-bitsforresiduals=84
-successoravgloggap=2.2973961172309734
+bitsforoutdegrees=51
+residualavgloggap=2.4608192114691003
+avgbitsforoutdegrees=2.429
+bitsforresiduals=101
+successoravgloggap=2.727961930295593
 maxrefcount=3
-successorexpstats=7,3,8,2,2
+successorexpstats=6,5,3,3,5,1
 residualarcs=21
-avgbitsforresiduals=4.2
-avgbitsforblocks=0.05
+avgbitsforresiduals=4.81
+avgbitsforblocks=0.333
 windowsize=7
-residualavggap=4.500
-copiedarcs=1
-avgbitsforreferences=0.7
+residualavggap=8.500
+copiedarcs=2
+avgbitsforreferences=0.81
 version=0
-compratio=1.34
-bitsperlink=7.273
+compratio=1.515
+bitsperlink=8.348
 compressionflags=
-nodes=20
-avgref=0.05
+nodes=21
+avgref=0.143
 zetak=3
 bitsforintervals=13
 intervalisedarcs=0
-bitspernode=8
-bitsforblocks=1
+bitspernode=9.143
+bitsforblocks=7
diff --git a/java/server/src/test/java/org/softwareheritage/graph/LeavesTest.java b/java/server/src/test/java/org/softwareheritage/graph/LeavesTest.java
--- a/java/server/src/test/java/org/softwareheritage/graph/LeavesTest.java
+++ b/java/server/src/test/java/org/softwareheritage/graph/LeavesTest.java
@@ -55,7 +55,7 @@
 
     SwhId src2 = new SwhId("swh:1:cnt:0000000000000000000000000000000000000004");
     ArrayList<SwhId> expectedLeaves2 = new ArrayList<>();
-    expectedLeaves2.add(new SwhId("swh:1:snp:0000000000000000000000000000000000000020"));
+    expectedLeaves2.add(new SwhId("swh:1:ori:0000000000000000000000000000000000000021"));
     expectedLeaves2.add(new SwhId("swh:1:rel:0000000000000000000000000000000000000019"));
     GraphTest.assertEqualsAnyOrder(expectedLeaves2, endpoint.leaves(src2));
   }
diff --git a/java/server/src/test/java/org/softwareheritage/graph/NeighborsTest.java b/java/server/src/test/java/org/softwareheritage/graph/NeighborsTest.java
--- a/java/server/src/test/java/org/softwareheritage/graph/NeighborsTest.java
+++ b/java/server/src/test/java/org/softwareheritage/graph/NeighborsTest.java
@@ -15,7 +15,7 @@
     Graph graph = getGraph();
     ArrayList<SwhId> expectedNodes = new ArrayList<>();
 
-    SwhId src1 = new SwhId("swh:1:snp:0000000000000000000000000000000000000020");
+    SwhId src1 = new SwhId("swh:1:ori:0000000000000000000000000000000000000021");
     Endpoint endpoint1 = new Endpoint(graph, "backward", "*");
     GraphTest.assertEqualsAnyOrder(expectedNodes, endpoint1.neighbors(src1));
 
@@ -63,6 +63,12 @@
     ArrayList<SwhId> expectedNodes4 = new ArrayList<>();
     expectedNodes4.add(new SwhId("swh:1:rev:0000000000000000000000000000000000000013"));
     GraphTest.assertEqualsAnyOrder(expectedNodes4, endpoint4.neighbors(src4));
+
+    SwhId src5 = new SwhId("swh:1:snp:0000000000000000000000000000000000000020");
+    Endpoint endpoint5 = new Endpoint(graph, "backward", "*");
+    ArrayList<SwhId> expectedNodes5 = new ArrayList<>();
+    expectedNodes5.add(new SwhId("swh:1:ori:0000000000000000000000000000000000000021"));
+    GraphTest.assertEqualsAnyOrder(expectedNodes5, endpoint5.neighbors(src5));
   }
 
   @Test
diff --git a/java/server/src/test/java/org/softwareheritage/graph/VisitTest.java b/java/server/src/test/java/org/softwareheritage/graph/VisitTest.java
--- a/java/server/src/test/java/org/softwareheritage/graph/VisitTest.java
+++ b/java/server/src/test/java/org/softwareheritage/graph/VisitTest.java
@@ -26,7 +26,7 @@
   @Test
   public void forwardFromRoot() {
     Graph graph = getGraph();
-    SwhId swhId = new SwhId("swh:1:snp:0000000000000000000000000000000000000020");
+    SwhId swhId = new SwhId("swh:1:ori:0000000000000000000000000000000000000021");
     Endpoint endpoint = new Endpoint(graph, "forward", "*");
     ArrayList<SwhPath> paths = endpoint.visitPaths(swhId);
     ArrayList<SwhId> nodes = endpoint.visitNodes(swhId);
@@ -34,6 +34,7 @@
     ArrayList<SwhPath> expectedPaths = new ArrayList<SwhPath>();
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
@@ -41,6 +42,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
@@ -48,6 +50,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
@@ -56,6 +59,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:dir:0000000000000000000000000000000000000008",
@@ -64,6 +68,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:rev:0000000000000000000000000000000000000003",
@@ -72,6 +77,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rel:0000000000000000000000000000000000000010",
           "swh:1:rev:0000000000000000000000000000000000000009",
@@ -80,6 +86,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rel:0000000000000000000000000000000000000010",
           "swh:1:rev:0000000000000000000000000000000000000009",
@@ -88,6 +95,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rel:0000000000000000000000000000000000000010",
           "swh:1:rev:0000000000000000000000000000000000000009",
@@ -97,6 +105,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rel:0000000000000000000000000000000000000010",
           "swh:1:rev:0000000000000000000000000000000000000009",
@@ -106,6 +115,7 @@
         ));
     expectedPaths.add(
         new SwhPath(
+          "swh:1:ori:0000000000000000000000000000000000000021",
           "swh:1:snp:0000000000000000000000000000000000000020",
           "swh:1:rel:0000000000000000000000000000000000000010",
           "swh:1:rev:0000000000000000000000000000000000000009",
@@ -184,7 +194,7 @@
   @Test
   public void backwardFromRoot() {
     Graph graph = getGraph();
-    SwhId swhId = new SwhId("swh:1:snp:0000000000000000000000000000000000000020");
+    SwhId swhId = new SwhId("swh:1:ori:0000000000000000000000000000000000000021");
     Endpoint endpoint = new Endpoint(graph, "backward", "*");
     ArrayList<SwhPath> paths = endpoint.visitPaths(swhId);
     ArrayList<SwhId> nodes = endpoint.visitNodes(swhId);
@@ -192,7 +202,7 @@
     ArrayList<SwhPath> expectedPaths = new ArrayList<SwhPath>();
     expectedPaths.add(
         new SwhPath(
-          "swh:1:snp:0000000000000000000000000000000000000020"
+          "swh:1:ori:0000000000000000000000000000000000000021"
         ));
 
     GraphTest.assertEqualsAnyOrder(expectedPaths, paths);
@@ -255,7 +265,8 @@
           "swh:1:dir:0000000000000000000000000000000000000006",
           "swh:1:dir:0000000000000000000000000000000000000008",
           "swh:1:rev:0000000000000000000000000000000000000009",
-          "swh:1:snp:0000000000000000000000000000000000000020"
+          "swh:1:snp:0000000000000000000000000000000000000020",
+          "swh:1:ori:0000000000000000000000000000000000000021"
         ));
     expectedPaths.add(
         new SwhPath(
@@ -264,7 +275,8 @@
           "swh:1:dir:0000000000000000000000000000000000000008",
           "swh:1:rev:0000000000000000000000000000000000000009",
           "swh:1:rel:0000000000000000000000000000000000000010",
-          "swh:1:snp:0000000000000000000000000000000000000020"
+          "swh:1:snp:0000000000000000000000000000000000000020",
+          "swh:1:ori:0000000000000000000000000000000000000021"
         ));
 
     GraphTest.assertEqualsAnyOrder(expectedPaths, paths);
@@ -479,11 +491,12 @@
   @Test
   public void forwardFromRootNodesOnly() {
     Graph graph = getGraph();
-    SwhId swhId = new SwhId("swh:1:snp:0000000000000000000000000000000000000020");
+    SwhId swhId = new SwhId("swh:1:ori:0000000000000000000000000000000000000021");
     Endpoint endpoint = new Endpoint(graph, "forward", "*");
     ArrayList<SwhId> nodes = endpoint.visitNodes(swhId);
 
     ArrayList<SwhId> expectedNodes = new ArrayList<SwhId>();
+    expectedNodes.add(new SwhId("swh:1:ori:0000000000000000000000000000000000000021"));
     expectedNodes.add(new SwhId("swh:1:snp:0000000000000000000000000000000000000020"));
     expectedNodes.add(new SwhId("swh:1:rel:0000000000000000000000000000000000000010"));
     expectedNodes.add(new SwhId("swh:1:rev:0000000000000000000000000000000000000009"));