diff --git a/doc/diagrams/.$PCD_PRD_encryption.drawio.bkp b/doc/diagrams/.$PCD_PRD_encryption.drawio.bkp
index 34636a0..da975f8 100644
--- a/doc/diagrams/.$PCD_PRD_encryption.drawio.bkp
+++ b/doc/diagrams/.$PCD_PRD_encryption.drawio.bkp
@@ -1,4 +1,4 @@
-<mxfile host="Electron" modified="2024-03-15T16:01:46.113Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.0.4 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="78OGLKvYNGM0Fz3_E3q0" version="24.0.4" type="device">
+<mxfile host="Electron" modified="2024-03-15T16:01:46.387Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.0.4 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="xhs4aQpYiYUxJ3mrvPJe" version="24.0.4" type="device">
   <diagram name="Page-1" id="Ay0TpeaQuVh3P3g7hVAg">
     <mxGraphModel dx="2261" dy="841" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
diff --git a/doc/diagrams/.$WalletCreate.drawio.bkp b/doc/diagrams/.$WalletCreate.drawio.bkp
index fad4eaa..64569e7 100644
--- a/doc/diagrams/.$WalletCreate.drawio.bkp
+++ b/doc/diagrams/.$WalletCreate.drawio.bkp
@@ -1,6 +1,6 @@
-<mxfile host="Electron" modified="2024-03-11T11:16:04.551Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="2nVjpWubJE9qWjlONld6" version="23.1.5" type="device">
+<mxfile host="Electron" modified="2024-03-15T20:31:24.051Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.0.4 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="furMGE3c5KUf9ZHwuKLI" version="24.0.4" type="device">
   <diagram id="bWoO5ACGZIaXrIiKNTKd" name="Page-1">
-    <mxGraphModel dx="2337" dy="1583" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="3088" dy="2010" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -61,7 +61,7 @@
             <mxPoint x="-717" y="-10" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-290" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="155" target="5h_mtuP3TllbSGRXwFMH-287">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-290" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="155" target="5h_mtuP3TllbSGRXwFMH-287" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="155" value="WalletCreate" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" parent="1" vertex="1">
@@ -451,10 +451,10 @@
         <mxCell id="XqTc7s29-gL46L3V4mSs-304" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;Encrypt&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-542" y="165" width="137.39" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="XqTc7s29-gL46L3V4mSs-309" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRevokeSpend&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;Encrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+        <mxCell id="XqTc7s29-gL46L3V4mSs-309" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRevokeSpend&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-971.1" y="83" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="XqTc7s29-gL46L3V4mSs-310" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyRevokeScan&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;Encrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+        <mxCell id="XqTc7s29-gL46L3V4mSs-310" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyRevokeScan&lt;/b&gt;&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-971.0000000000001" y="128" width="163.42" height="30" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-286" value="Message" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
@@ -536,13 +536,13 @@
             <mxPoint x="-1322" y="438" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KGCLxLdSfCaxDo2TsfCf-292" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRecoverScan&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;encrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+        <mxCell id="KGCLxLdSfCaxDo2TsfCf-292" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRecoverScan&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;private metadata&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1524.1" y="426.07" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="KGCLxLdSfCaxDo2TsfCf-293" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyMainSpend&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;encrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+        <mxCell id="KGCLxLdSfCaxDo2TsfCf-293" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyMainSpend&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: 400;&quot;&gt;private metadata&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1524" y="467.07" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="KGCLxLdSfCaxDo2TsfCf-294" value="&lt;div style=&quot;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyMainScan&lt;br&gt;&lt;/span&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;encrypt&lt;/span&gt;&lt;br&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+        <mxCell id="KGCLxLdSfCaxDo2TsfCf-294" value="&lt;div style=&quot;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyMainScan&lt;br&gt;&lt;/span&gt;&lt;span style=&quot;font-weight: 400;&quot;&gt;private metadata&lt;/span&gt;&lt;br&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1524" y="505.78" width="163.42" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KGCLxLdSfCaxDo2TsfCf-295" value="RequestPrdResponse" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
@@ -614,10 +614,10 @@
         <mxCell id="xSIgGbmu95QqtSGV3vQQ-284" value="Password&lt;br&gt;18 characters" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
           <mxGeometry x="-1229.39" y="81" width="115.75" height="32" as="geometry" />
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="Lj3ro7yhdUhcsVQ_hEMl-284" target="2">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Lj3ro7yhdUhcsVQ_hEMl-284" target="2" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-286" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Lj3ro7yhdUhcsVQ_hEMl-284" target="KGCLxLdSfCaxDo2TsfCf-292">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-286" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="Lj3ro7yhdUhcsVQ_hEMl-284" target="KGCLxLdSfCaxDo2TsfCf-292" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-717" y="30" />
@@ -629,7 +629,7 @@
         <mxCell id="Lj3ro7yhdUhcsVQ_hEMl-284" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenRecover&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-798.7099999999999" y="-30" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-288" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="5h_mtuP3TllbSGRXwFMH-287" target="KGCLxLdSfCaxDo2TsfCf-293">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-288" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="5h_mtuP3TllbSGRXwFMH-287" target="KGCLxLdSfCaxDo2TsfCf-293" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-1075" y="10" />
@@ -638,7 +638,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-289" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="5h_mtuP3TllbSGRXwFMH-287" target="KGCLxLdSfCaxDo2TsfCf-294">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-289" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="5h_mtuP3TllbSGRXwFMH-287" target="KGCLxLdSfCaxDo2TsfCf-294" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-1075" y="10" />
@@ -647,10 +647,10 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-287" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenMainnet&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" vertex="1" parent="1">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-287" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenMainnet&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1157.15" y="-30" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-292" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;" edge="1" parent="1" source="5h_mtuP3TllbSGRXwFMH-291" target="XqTc7s29-gL46L3V4mSs-309">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-292" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;" parent="1" source="5h_mtuP3TllbSGRXwFMH-291" target="XqTc7s29-gL46L3V4mSs-309" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-894" y="50" />
@@ -659,7 +659,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-293" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;" edge="1" parent="1" source="5h_mtuP3TllbSGRXwFMH-291" target="XqTc7s29-gL46L3V4mSs-310">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-293" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;" parent="1" source="5h_mtuP3TllbSGRXwFMH-291" target="XqTc7s29-gL46L3V4mSs-310" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-894" y="50" />
@@ -668,7 +668,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-291" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenRevoke&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" vertex="1" parent="1">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-291" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenRevoke&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-975.9000000000001" y="-30" width="163.42" height="30" as="geometry" />
         </mxCell>
       </root>
diff --git a/doc/diagrams/PCD_PRD_encryption.drawio b/doc/diagrams/PCD_PRD_encryption.drawio
index da975f8..46fb5f9 100644
--- a/doc/diagrams/PCD_PRD_encryption.drawio
+++ b/doc/diagrams/PCD_PRD_encryption.drawio
@@ -1,4 +1,4 @@
-<mxfile host="Electron" modified="2024-03-15T16:01:46.387Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.0.4 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="xhs4aQpYiYUxJ3mrvPJe" version="24.0.4" type="device">
+<mxfile host="Electron" modified="2024-03-15T16:03:35.992Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.0.4 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="yY6XcN_MZpx2s9Jv7K8O" version="24.0.4" type="device">
   <diagram name="Page-1" id="Ay0TpeaQuVh3P3g7hVAg">
     <mxGraphModel dx="2261" dy="841" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
@@ -171,7 +171,7 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="Z6IZM2XFgX0QcQ6djccE-5" value="RadomAesKey" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
-          <mxGeometry x="212" y="59.06999999999999" width="86" height="20" as="geometry" />
+          <mxGeometry x="217" y="59.06999999999999" width="86" height="20" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
diff --git a/doc/diagrams/WalletCreate.drawio b/doc/diagrams/WalletCreate.drawio
index faad155..3c853c5 100644
--- a/doc/diagrams/WalletCreate.drawio
+++ b/doc/diagrams/WalletCreate.drawio
@@ -1,6 +1,6 @@
-<mxfile host="Electron" modified="2024-03-11T11:16:06.207Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.1.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="zRB5J0qZwh7_t3OIi9Os" version="23.1.5" type="device">
+<mxfile host="Electron" modified="2024-03-15T20:32:16.540Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.0.4 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="WvC390GSmpaEJ2LHzRwC" version="24.0.4" type="device">
   <diagram id="bWoO5ACGZIaXrIiKNTKd" name="Page-1">
-    <mxGraphModel dx="2643" dy="1769" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="3088" dy="2010" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -61,7 +61,7 @@
             <mxPoint x="-717" y="-10" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-290" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="155" target="5h_mtuP3TllbSGRXwFMH-287">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-290" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="155" target="5h_mtuP3TllbSGRXwFMH-287" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="155" value="WalletCreate" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" parent="1" vertex="1">
@@ -419,15 +419,15 @@
         <mxCell id="HEAZNrv7IqFEUBU4v7G9-340" value="SharedPeerListMerged" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
           <mxGeometry x="-1005.8499999999999" y="460.29" width="180" height="30.71" as="geometry" />
         </mxCell>
-        <mxCell id="HEAZNrv7IqFEUBU4v7G9-371" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="XqTc7s29-gL46L3V4mSs-309" target="77" edge="1">
+        <mxCell id="HEAZNrv7IqFEUBU4v7G9-371" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="77" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-800" y="98" />
             </Array>
-            <mxPoint x="-827.2399999999998" y="142.5" as="sourcePoint" />
+            <mxPoint x="-807.6799999999998" y="98" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="HEAZNrv7IqFEUBU4v7G9-372" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="XqTc7s29-gL46L3V4mSs-310" target="77" edge="1">
+        <mxCell id="HEAZNrv7IqFEUBU4v7G9-372" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="77" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-810" y="81" as="targetPoint" />
             <Array as="points">
@@ -435,7 +435,7 @@
               <mxPoint x="-800" y="146" />
               <mxPoint x="-800" y="98" />
             </Array>
-            <mxPoint x="-828.2399999999998" y="185.5" as="sourcePoint" />
+            <mxPoint x="-807.5799999999999" y="143" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="AH83P5LbfY0wmGR11IUw-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;" parent="1" source="XqTc7s29-gL46L3V4mSs-304" target="181" edge="1">
@@ -451,12 +451,6 @@
         <mxCell id="XqTc7s29-gL46L3V4mSs-304" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;Encrypt&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-542" y="165" width="137.39" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="XqTc7s29-gL46L3V4mSs-309" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRevokeSpend&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;Encrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-971.1" y="83" width="163.42" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="XqTc7s29-gL46L3V4mSs-310" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyRevokeScan&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;Encrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-971.0000000000001" y="128" width="163.42" height="30" as="geometry" />
-        </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-286" value="Message" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
           <mxGeometry x="-722.0000000000001" y="643" width="60" height="30" as="geometry" />
         </mxCell>
@@ -536,13 +530,13 @@
             <mxPoint x="-1322" y="438" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KGCLxLdSfCaxDo2TsfCf-292" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRecoverScan&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;encrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+        <mxCell id="KGCLxLdSfCaxDo2TsfCf-292" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRecoverScan&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;private metadata&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1524.1" y="426.07" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="KGCLxLdSfCaxDo2TsfCf-293" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyMainSpend&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;encrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+        <mxCell id="KGCLxLdSfCaxDo2TsfCf-293" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyMainSpend&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;&lt;/b&gt;&lt;span style=&quot;font-weight: 400;&quot;&gt;private metadata&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1524" y="467.07" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="KGCLxLdSfCaxDo2TsfCf-294" value="&lt;div style=&quot;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyMainScan&lt;br&gt;&lt;/span&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;encrypt&lt;/span&gt;&lt;br&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+        <mxCell id="KGCLxLdSfCaxDo2TsfCf-294" value="&lt;div style=&quot;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyMainScan&lt;br&gt;&lt;/span&gt;&lt;span style=&quot;font-weight: 400;&quot;&gt;private metadata&lt;/span&gt;&lt;br&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1524" y="505.78" width="163.42" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KGCLxLdSfCaxDo2TsfCf-295" value="RequestPrdResponse" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
@@ -614,10 +608,10 @@
         <mxCell id="xSIgGbmu95QqtSGV3vQQ-284" value="Password&lt;br&gt;18 characters" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
           <mxGeometry x="-1229.39" y="81" width="115.75" height="32" as="geometry" />
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="Lj3ro7yhdUhcsVQ_hEMl-284" target="2">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Lj3ro7yhdUhcsVQ_hEMl-284" target="2" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-286" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="Lj3ro7yhdUhcsVQ_hEMl-284" target="KGCLxLdSfCaxDo2TsfCf-292">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-286" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="Lj3ro7yhdUhcsVQ_hEMl-284" target="KGCLxLdSfCaxDo2TsfCf-292" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-717" y="30" />
@@ -629,7 +623,7 @@
         <mxCell id="Lj3ro7yhdUhcsVQ_hEMl-284" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenRecover&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-798.7099999999999" y="-30" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-288" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="5h_mtuP3TllbSGRXwFMH-287" target="KGCLxLdSfCaxDo2TsfCf-293">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-288" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="5h_mtuP3TllbSGRXwFMH-287" target="KGCLxLdSfCaxDo2TsfCf-293" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-1075" y="10" />
@@ -638,7 +632,7 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-289" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="5h_mtuP3TllbSGRXwFMH-287" target="KGCLxLdSfCaxDo2TsfCf-294">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-289" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="5h_mtuP3TllbSGRXwFMH-287" target="KGCLxLdSfCaxDo2TsfCf-294" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-1075" y="10" />
@@ -647,30 +641,38 @@
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-287" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenMainnet&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" vertex="1" parent="1">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-287" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenMainnet&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1157.15" y="-30" width="163.42" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-292" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;" edge="1" parent="1" source="5h_mtuP3TllbSGRXwFMH-291" target="XqTc7s29-gL46L3V4mSs-309">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-292" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;" parent="1" source="5h_mtuP3TllbSGRXwFMH-291" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-894" y="50" />
               <mxPoint x="-991" y="50" />
               <mxPoint x="-991" y="98" />
             </Array>
+            <mxPoint x="-971.0999999999999" y="98" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-293" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;" edge="1" parent="1" source="5h_mtuP3TllbSGRXwFMH-291" target="XqTc7s29-gL46L3V4mSs-310">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-293" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;strokeColor=#999999;" parent="1" source="5h_mtuP3TllbSGRXwFMH-291" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-894" y="50" />
               <mxPoint x="-991" y="50" />
               <mxPoint x="-991" y="143" />
             </Array>
+            <mxPoint x="-971" y="143" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="5h_mtuP3TllbSGRXwFMH-291" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenRevoke&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" vertex="1" parent="1">
+        <mxCell id="5h_mtuP3TllbSGRXwFMH-291" value="&lt;div style=&quot;text-align: center;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;KeyGenRevoke&lt;/span&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-975.9000000000001" y="-30" width="163.42" height="30" as="geometry" />
         </mxCell>
+        <mxCell id="6VpLyi-W56kXfNHX2Y9h-284" value="&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyRevokeSpend&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" vertex="1" parent="1">
+          <mxGeometry x="-970" y="84" width="160" height="29" as="geometry" />
+        </mxCell>
+        <mxCell id="6VpLyi-W56kXfNHX2Y9h-285" value="&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;KeyRevokeScan&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" vertex="1" parent="1">
+          <mxGeometry x="-970" y="128" width="160" height="29" as="geometry" />
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
diff --git a/doc/diagrams/WalletCreate.png b/doc/diagrams/WalletCreate.png
index 2d635dd..ff95f6a 100644
Binary files a/doc/diagrams/WalletCreate.png and b/doc/diagrams/WalletCreate.png differ