diff --git a/docs/images/arch-container.pdf b/docs/images/arch-container.pdf
index e2e26d3..559f1fc 100644
Binary files a/docs/images/arch-container.pdf and b/docs/images/arch-container.pdf differ
diff --git a/docs/images/arch-container.png b/docs/images/arch-container.png
index dabd96d..d071e5b 100644
Binary files a/docs/images/arch-container.png and b/docs/images/arch-container.png differ
diff --git a/docs/images/arch-container.puml b/docs/images/arch-container.puml
index 9fb2cfc..5b90795 100644
--- a/docs/images/arch-container.puml
+++ b/docs/images/arch-container.puml
@@ -1,23 +1,23 @@
 @startuml arch-container
 ' !includeurl https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Container.puml
 !include c4-plantuml/C4_Container.puml
 
 ' title Container diagram for the Software Heritage virtual filesystem (SwhFS)
 left to right direction
 
 Person(user, "User")
 Container(fuse, "FUSE", "kernel", "Delegates filesystem implementation to user space")
 
 System_Boundary(swhfs_bound, "SwhFS") {
 	Container(swh_fuse, "swh.fuse", "pyfuse3, libfuse, FUSE", "Provides a filesystem view of Software Heritage objects")
 	ContainerDb(cache, "Cache", "SQLite or in-memory", "Local cache for objects and metadata")
-	Rel(swh_fuse, cache, "Reads objects and metadata", "SQL")
+	Rel(swh_fuse, cache, "Reads objects and metadata from", "SQL")
 }
 
 System_Ext(archive, "Software Heritage archive")
 
-Rel(user, fuse, "Access", "Filesystem")
+Rel(user, fuse, "Accesses", "Filesystem")
 Rel(fuse, swh_fuse, "Calls user space daemon", "FUSE API")
-Rel(swh_fuse, archive, "Retrieves objects and metadata", "REST API")
+Rel(swh_fuse, archive, "Retrieves objects and metadata from", "REST API")
 
 @enduml
diff --git a/docs/images/arch-container.svg b/docs/images/arch-container.svg
index 8ff85f4..dd86de3 100644
--- a/docs/images/arch-container.svg
+++ b/docs/images/arch-container.svg
@@ -1,174 +1,174 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="333px" preserveAspectRatio="none" style="width:1251px;height:333px;" version="1.1" viewBox="0 0 1251 333" width="1251px" zoomAndPan="magnify"><defs/><g><!--MD5=[f9d78948ff2b83227b66866d68effa63]
-cluster swhfs_bound--><rect fill="#FFFFFF" height="207" style="stroke: #444444; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;" width="668" x="572" y="24.5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="85" x="863.5" y="39.4951">«boundary»</text><text fill="#444444" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="58" x="877" y="57.6484">SwhFS</text><text fill="#444444" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="62" x="875" y="72.5605">[System]</text><!--MD5=[23d6fcc501312e5a77e0f62381cd199c]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="333px" preserveAspectRatio="none" style="width:1253px;height:333px;" version="1.1" viewBox="0 0 1253 333" width="1253px" zoomAndPan="magnify"><defs/><g><!--MD5=[f9d78948ff2b83227b66866d68effa63]
+cluster swhfs_bound--><rect fill="#FFFFFF" height="207" style="stroke: #444444; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;" width="670" x="572" y="24.5"/><text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="85" x="864.5" y="39.4951">«boundary»</text><text fill="#444444" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="58" x="878" y="57.6484">SwhFS</text><text fill="#444444" font-family="sans-serif" font-size="12" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="62" x="876" y="72.5605">[System]</text><!--MD5=[23d6fcc501312e5a77e0f62381cd199c]
 entity swh_fuse--><rect fill="#438DD5" height="115.4531" style="stroke: #3C7FC0; stroke-width: 1.5;" width="219" x="588" y="98"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="69" x="663" y="119.1387">«container»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="81" x="657" y="136.8203">swh.fuse</text><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="145" x="625" y="151.7324">[pyfuse3, libfuse, FUSE]</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="0" x="699.5" y="167.5576"/><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="195" x="598" y="183.8545">Provides a filesystem view of</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="177" x="609" y="200.1514">Software Heritage objects</text><!--MD5=[23ec4f1fff159d71b633b9f85a9aab58]
-entity cache--><path d="M1012,101.5 C1012,91.5 1118,91.5 1118,91.5 C1118,91.5 1224,91.5 1224,101.5 L1224,205.9531 C1224,215.9531 1118,215.9531 1118,215.9531 C1118,215.9531 1012,215.9531 1012,205.9531 L1012,101.5 " fill="#438DD5" style="stroke: #3C7FC0; stroke-width: 1.5;"/><path d="M1012,101.5 C1012,111.5 1118,111.5 1118,111.5 C1118,111.5 1224,111.5 1224,101.5 " fill="none" style="stroke: #3C7FC0; stroke-width: 1.5;"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="69" x="1083.5" y="126.6387">«container»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1091" y="144.3203">Cache</text><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="130" x="1053" y="159.2324">[SQLite or in-memory]</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="0" x="1120" y="175.0576"/><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="188" x="1022" y="191.3545">Local cache for objects and</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="1085.5" y="207.6514">metadata</text><!--MD5=[8fc3522a43f8c7199df5e09e5bb0188e]
+entity cache--><path d="M1014,101.5 C1014,91.5 1120,91.5 1120,91.5 C1120,91.5 1226,91.5 1226,101.5 L1226,205.9531 C1226,215.9531 1120,215.9531 1120,215.9531 C1120,215.9531 1014,215.9531 1014,205.9531 L1014,101.5 " fill="#438DD5" style="stroke: #3C7FC0; stroke-width: 1.5;"/><path d="M1014,101.5 C1014,111.5 1120,111.5 1120,111.5 C1120,111.5 1226,111.5 1226,101.5 " fill="none" style="stroke: #3C7FC0; stroke-width: 1.5;"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="69" x="1085.5" y="126.6387">«container»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="54" x="1093" y="144.3203">Cache</text><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="130" x="1055" y="159.2324">[SQLite or in-memory]</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="0" x="1122" y="175.0576"/><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="188" x="1024" y="191.3545">Local cache for objects and</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="1087.5" y="207.6514">metadata</text><!--MD5=[8fc3522a43f8c7199df5e09e5bb0188e]
 entity user--><rect fill="#08427B" height="52.5938" style="stroke: #073B6F; stroke-width: 1.5;" width="74" x="6" y="129"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="16" y="150.1387">«person»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="22.5" y="167.8203">User</text><!--MD5=[f2c2b31a53c5c4ce909f55cafb9e3eda]
 entity fuse--><rect fill="#438DD5" height="131.75" style="stroke: #3C7FC0; stroke-width: 1.5;" width="184" x="214" y="89.5"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="69" x="271.5" y="110.6387">«container»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="43" x="284.5" y="128.3203">FUSE</text><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="46" x="283" y="143.2324">[kernel]</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="0" x="308" y="159.0576"/><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="144" x="232" y="175.3545">Delegates filesystem</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="160" x="224" y="191.6514">implementation to user</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="285" y="207.9482">space</text><!--MD5=[a8305b23d211bc1ccd9424c697ead2f2]
-entity archive--><rect fill="#999999" height="71.2188" style="stroke: #8A8A8A; stroke-width: 1.5;" width="188" x="1024" y="251"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="110" x="1063" y="272.1387">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="162" x="1034" y="289.8203">Software Heritage</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="1086" y="308.4453">archive</text><!--MD5=[10b3a46bea91c5f43069f2361ea72c4c]
-link swh_fuse to cache--><path d="M807.09,154.98 C868.46,154.69 944.98,154.32 1006.64,154.03 " fill="none" id="swh_fuse-&gt;cache" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="1011.8,154,1002.7773,150.0515,1006.8001,154.0286,1002.823,158.0514,1011.8,154" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="838" y="121.5669">Reads objects and</text><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="72" x="873.5" y="136.6997">metadata</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="33" x="893" y="150.9043">[SQL]</text><!--MD5=[ab48cbd348a76e20eaf6c83ec0a55c56]
-link user to fuse--><path d="M80.02,155.5 C113.14,155.5 163.77,155.5 208.62,155.5 " fill="none" id="user-&gt;fuse" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="213.78,155.5,204.78,151.5,208.78,155.5,204.78,159.5,213.78,155.5" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="51" x="121.5" y="137.5669">Access</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="72" x="111" y="151.7715">[Filesystem]</text><!--MD5=[bb698cf1ed9bc1e60225f23580a72fd2]
+entity archive--><rect fill="#999999" height="71.2188" style="stroke: #8A8A8A; stroke-width: 1.5;" width="188" x="1026" y="251"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="110" x="1065" y="272.1387">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="162" x="1036" y="289.8203">Software Heritage</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="1088" y="308.4453">archive</text><!--MD5=[10b3a46bea91c5f43069f2361ea72c4c]
+link swh_fuse to cache--><path d="M807.06,154.98 C868.96,154.69 946.34,154.32 1008.54,154.03 " fill="none" id="swh_fuse-&gt;cache" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="1013.75,154,1004.7386,150.0257,1008.75,154.0143,1004.7615,158.0257,1013.75,154" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="839" y="121.5669">Reads objects and</text><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="854.5" y="136.6997">metadata from</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="33" x="894" y="150.9043">[SQL]</text><!--MD5=[ab48cbd348a76e20eaf6c83ec0a55c56]
+link user to fuse--><path d="M80.02,155.5 C113.14,155.5 163.77,155.5 208.62,155.5 " fill="none" id="user-&gt;fuse" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="213.78,155.5,204.78,151.5,208.78,155.5,204.78,159.5,213.78,155.5" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="113" y="137.5669">Accesses</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="72" x="111" y="151.7715">[Filesystem]</text><!--MD5=[bb698cf1ed9bc1e60225f23580a72fd2]
 link fuse to swh_fuse--><path d="M398.32,155.5 C453.32,155.5 523.83,155.5 582.48,155.5 " fill="none" id="fuse-&gt;swh_fuse" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="587.75,155.5,578.75,151.5,582.75,155.5,578.75,159.5,587.75,155.5" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="121" x="429" y="122.5669">Calls user space</text><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="60" x="462" y="137.6997">daemon</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="459.5" y="151.9043">[FUSE API]</text><!--MD5=[6556e5d5149acdab6ce9b45fdcf5a98f]
-link swh_fuse to archive--><path d="M807.36,199.16 C817.34,202.79 827.32,206.29 837,209.5 C896.81,229.32 964.95,248.14 1019.04,262.22 " fill="none" id="swh_fuse-&gt;archive" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="1023.9,263.48,1016.1982,257.3414,1019.0613,262.2202,1014.1825,265.0834,1023.9,263.48" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="128" x="843" y="176.5669">Retrieves objects</text><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="105" x="857" y="191.6997">and metadata</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="64" x="877.5" y="205.9043">[REST API]</text><!--MD5=[2c42741a762a455f59c2f5b9160c71b8]
+link swh_fuse to archive--><path d="M807.36,199.18 C817.33,202.8 827.32,206.3 837,209.5 C897.46,229.48 966.39,248.37 1020.97,262.44 " fill="none" id="swh_fuse-&gt;archive" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="1025.87,263.7,1018.1468,257.5883,1021.0269,262.4571,1016.1582,265.3372,1025.87,263.7" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="128" x="844" y="176.5669">Retrieves objects</text><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="145" x="838" y="191.6997">and metadata from</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="64" x="878.5" y="205.9043">[REST API]</text><!--MD5=[5fe99f700e4f8329d9336aad7ab1cfc2]
 @startuml arch-container
 
 
 
 
 
 skinparam defaultTextAlignment center
 
 skinparam wrapWidth 200
 skinparam maxMessageSize 150
 
 skinparam rectangle {
     StereotypeFontSize 12
     shadowing false
 }
 
 skinparam database {
     StereotypeFontSize 12
     shadowing false
 }
 
 skinparam Arrow {
     Color #666666
     FontColor #666666
     FontSize 12
 }
 
 skinparam rectangle<<boundary>> {
     Shadowing false
     StereotypeFontSize 0
     FontColor #444444
     BorderColor #444444
     BorderStyle dashed
 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 skinparam rectangle<<person>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #08427B
     BorderColor #073B6F
 }
 
 skinparam rectangle<<external_person>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #686868
     BorderColor #8A8A8A
 }
 
 skinparam rectangle<<system>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #1168BD
     BorderColor #3C7FC0
 }
 
 skinparam rectangle<<external_system>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #999999
     BorderColor #8A8A8A
 }
 
 skinparam database<<system>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #1168BD
     BorderColor #3C7FC0
 }
 
 skinparam database<<external_system>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #999999
     BorderColor #8A8A8A
 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 skinparam rectangle<<container>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #438DD5
     BorderColor #3C7FC0
 }
 
 skinparam database<<container>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #438DD5
     BorderColor #3C7FC0
 }
 
 
 
 
 
 
 
 
 left to right direction
 
 rectangle "==User" <<person>> as user
 rectangle "==FUSE\n//<size:12>[kernel]</size>//\n\n Delegates filesystem implementation to user space" <<container>> as fuse
 
 rectangle "==SwhFS\n<size:12>[System]</size>" <<boundary>> as swhfs_bound {
 	rectangle "==swh.fuse\n//<size:12>[pyfuse3, libfuse, FUSE]</size>//\n\n Provides a filesystem view of Software Heritage objects" <<container>> as swh_fuse
 	database "==Cache\n//<size:12>[SQLite or in-memory]</size>//\n\n Local cache for objects and metadata" <<container>> as cache
-	swh_fuse - -> cache : "===Reads objects and metadata\n//<size:12>[SQL]</size>//"
+	swh_fuse - -> cache : "===Reads objects and metadata from\n//<size:12>[SQL]</size>//"
 }
 
 rectangle "==Software Heritage archive" <<external_system>> as archive
 
-user - -> fuse : "===Access\n//<size:12>[Filesystem]</size>//"
+user - -> fuse : "===Accesses\n//<size:12>[Filesystem]</size>//"
 fuse - -> swh_fuse : "===Calls user space daemon\n//<size:12>[FUSE API]</size>//"
-swh_fuse - -> archive : "===Retrieves objects and metadata\n//<size:12>[REST API]</size>//"
+swh_fuse - -> archive : "===Retrieves objects and metadata from\n//<size:12>[REST API]</size>//"
 
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Java Version: 14.0.2+12-Debian-1.1
 Operating System: Linux
 Default Encoding: UTF-8
 Language: en
 Country: US
 --></g></svg>
\ No newline at end of file
diff --git a/docs/images/arch-context.pdf b/docs/images/arch-context.pdf
index ee12b60..b4da999 100644
Binary files a/docs/images/arch-context.pdf and b/docs/images/arch-context.pdf differ
diff --git a/docs/images/arch-context.png b/docs/images/arch-context.png
index ecad0cc..ad65a76 100644
Binary files a/docs/images/arch-context.png and b/docs/images/arch-context.png differ
diff --git a/docs/images/arch-context.puml b/docs/images/arch-context.puml
index 22fb244..68d120a 100644
--- a/docs/images/arch-context.puml
+++ b/docs/images/arch-context.puml
@@ -1,15 +1,15 @@
 @startuml arch-context
 ' !includeurl https://raw.githubusercontent.com/RicardoNiepel/C4-PlantUML/master/C4_Context.puml
 !include c4-plantuml/C4_Context.puml
 
 ' title System context diagram for the Software Heritage virtual filesystem (SwhFS)
 left to right direction
 
 Person(user, "User")
 System(swhfs, "Software Heritage virtual filesystem\n(SwhFS)")
 System_Ext(archive, "Software Heritage archive")
 
 Rel(user, swhfs, "Accesses", "Filesystem")
-Rel(swhfs, archive, "Retrieves objects and metadata", "REST API")
+Rel(swhfs, archive, "Retrieves objects and metadata from", "REST API")
 
 @enduml
diff --git a/docs/images/arch-context.svg b/docs/images/arch-context.svg
index 11651aa..5a2d8af 100644
--- a/docs/images/arch-context.svg
+++ b/docs/images/arch-context.svg
@@ -1,136 +1,136 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="108px" preserveAspectRatio="none" style="width:796px;height:108px;" version="1.1" viewBox="0 0 796 108" width="796px" zoomAndPan="magnify"><defs/><g><!--MD5=[8fc3522a43f8c7199df5e09e5bb0188e]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="108px" preserveAspectRatio="none" style="width:808px;height:108px;" version="1.1" viewBox="0 0 808 108" width="808px" zoomAndPan="magnify"><defs/><g><!--MD5=[8fc3522a43f8c7199df5e09e5bb0188e]
 entity user--><rect fill="#08427B" height="52.5938" style="stroke: #073B6F; stroke-width: 1.5;" width="74" x="6" y="27.5"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="16" y="48.6387">«person»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="22.5" y="66.3203">User</text><!--MD5=[94c53a76601d3b5ed673cabb5209f91e]
 entity swhfs--><rect fill="#1168BD" height="87.5156" style="stroke: #3C7FC0; stroke-width: 1.5;" width="188" x="214" y="10"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="280" y="31.1387">«system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="162" x="224" y="48.8203">Software Heritage</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="152" x="232" y="67.4453">virtual filesystem</text><text fill="#FFFFFF" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="56" x="280" y="84.2139">(SwhFS)</text><!--MD5=[a8305b23d211bc1ccd9424c697ead2f2]
-entity archive--><rect fill="#999999" height="71.2188" style="stroke: #8A8A8A; stroke-width: 1.5;" width="188" x="597" y="18.5"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="110" x="636" y="39.6387">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="162" x="607" y="57.3203">Software Heritage</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="659" y="75.9453">archive</text><!--MD5=[15a996fe1ec2f190ff6b000296f7bd56]
+entity archive--><rect fill="#999999" height="71.2188" style="stroke: #8A8A8A; stroke-width: 1.5;" width="188" x="609" y="18.5"/><text fill="#FFFFFF" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="110" x="648" y="39.6387">«external_system»</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="162" x="619" y="57.3203">Software Heritage</text><text fill="#FFFFFF" font-family="sans-serif" font-size="16" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="64" x="671" y="75.9453">archive</text><!--MD5=[15a996fe1ec2f190ff6b000296f7bd56]
 link user to swhfs--><path d="M80.02,54 C113.07,54 163.58,54 208.57,54 " fill="none" id="user-&gt;swhfs" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="213.75,54,204.75,50,208.75,54,204.75,58,213.75,54" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="68" x="113" y="36.0669">Accesses</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="72" x="111" y="50.2715">[Filesystem]</text><!--MD5=[a7e6bac0ac0369cb26df61e6b3ce9979]
-link swhfs to archive--><path d="M402.2,54 C459.62,54 533.16,54 591.53,54 " fill="none" id="swhfs-&gt;archive" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="596.77,54,587.77,50,591.77,54,587.77,58,596.77,54" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="128" x="433" y="21.0669">Retrieves objects</text><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="105" x="447" y="36.1997">and metadata</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="64" x="467.5" y="50.4043">[REST API]</text><!--MD5=[2039c00102706b142fc8cc9c06a0df85]
+link swhfs to archive--><path d="M402.14,54 C462.85,54 541.97,54 603.69,54 " fill="none" id="swhfs-&gt;archive" style="stroke: #666666; stroke-width: 1.0;"/><polygon fill="#666666" points="608.85,54,599.85,50,603.85,54,599.85,58,608.85,54" style="stroke: #666666; stroke-width: 1.0;"/><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="128" x="439" y="21.0669">Retrieves objects</text><text fill="#666666" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="145" x="433" y="36.1997">and metadata from</text><text fill="#666666" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="64" x="473.5" y="50.4043">[REST API]</text><!--MD5=[ad05733741e6415dc971fd39ac73cd5b]
 @startuml arch-context
 
 
 
 
 
 skinparam defaultTextAlignment center
 
 skinparam wrapWidth 200
 skinparam maxMessageSize 150
 
 skinparam rectangle {
     StereotypeFontSize 12
     shadowing false
 }
 
 skinparam database {
     StereotypeFontSize 12
     shadowing false
 }
 
 skinparam Arrow {
     Color #666666
     FontColor #666666
     FontSize 12
 }
 
 skinparam rectangle<<boundary>> {
     Shadowing false
     StereotypeFontSize 0
     FontColor #444444
     BorderColor #444444
     BorderStyle dashed
 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 skinparam rectangle<<person>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #08427B
     BorderColor #073B6F
 }
 
 skinparam rectangle<<external_person>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #686868
     BorderColor #8A8A8A
 }
 
 skinparam rectangle<<system>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #1168BD
     BorderColor #3C7FC0
 }
 
 skinparam rectangle<<external_system>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #999999
     BorderColor #8A8A8A
 }
 
 skinparam database<<system>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #1168BD
     BorderColor #3C7FC0
 }
 
 skinparam database<<external_system>> {
     StereotypeFontColor #FFFFFF
     FontColor #FFFFFF
     BackgroundColor #999999
     BorderColor #8A8A8A
 }
 
 
 
 
 
 
 
 
 
 
 
 
 left to right direction
 
 rectangle "==User" <<person>> as user
 rectangle "==Software Heritage virtual filesystem\n(SwhFS)" <<system>> as swhfs
 rectangle "==Software Heritage archive" <<external_system>> as archive
 
 user - -> swhfs : "===Accesses\n//<size:12>[Filesystem]</size>//"
-swhfs - -> archive : "===Retrieves objects and metadata\n//<size:12>[REST API]</size>//"
+swhfs - -> archive : "===Retrieves objects and metadata from\n//<size:12>[REST API]</size>//"
 
 @enduml
 
 PlantUML version 1.2020.02(Sun Mar 01 11:22:07 CET 2020)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
 Java Version: 14.0.2+12-Debian-1.1
 Operating System: Linux
 Default Encoding: UTF-8
 Language: en
 Country: US
 --></g></svg>
\ No newline at end of file