diff --git a/doc/diagrams/.$KeyGen.drawio.bkp b/doc/diagrams/.$KeyGen.drawio.bkp
index 8487df1..2a3e3b5 100644
--- a/doc/diagrams/.$KeyGen.drawio.bkp
+++ b/doc/diagrams/.$KeyGen.drawio.bkp
@@ -1,4 +1,4 @@
-<mxfile host="Electron" modified="2024-03-11T11:09:51.864Z" 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="2lSS2Wq5BSh6qAONdjrh" version="23.1.5" type="device">
+<mxfile host="Electron" modified="2024-03-11T11:10:02.153Z" 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="VYEXviXL3rC-9rXoQrR0" version="23.1.5" type="device">
   <diagram name="Page-1" id="AEsfMXb70QaqmTxDDtmt">
     <mxGraphModel dx="2451" dy="1652" 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/KeyGen.drawio b/doc/diagrams/KeyGen.drawio
index 2a3e3b5..4b0e694 100644
--- a/doc/diagrams/KeyGen.drawio
+++ b/doc/diagrams/KeyGen.drawio
@@ -1,53 +1,53 @@
-<mxfile host="Electron" modified="2024-03-11T11:10:02.153Z" 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="VYEXviXL3rC-9rXoQrR0" version="23.1.5" type="device">
+<mxfile host="Electron" modified="2024-03-11T11:44:56.528Z" 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="3R7gyjoupbFF3ONVhUoX" version="24.0.4" type="device">
   <diagram name="Page-1" id="AEsfMXb70QaqmTxDDtmt">
-    <mxGraphModel dx="2451" dy="1652" 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="2608" 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">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-1" value="SeedRand-Spend&lt;br&gt;512 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-1" value="SeedRand-Spend&lt;br&gt;512 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="-1600" y="-1119.5" width="130" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-1450" y="-1160" width="160" height="140" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-3" value="KeyGen" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontStyle=1" vertex="1" parent="1">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-3" value="KeyGen" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontStyle=1" parent="1" vertex="1">
           <mxGeometry x="-1450" y="-1160" width="80" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-13" 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;" edge="1" parent="1" source="lHBKXWLrEfhbahlG_4dC-4" target="lHBKXWLrEfhbahlG_4dC-11">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-13" 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="lHBKXWLrEfhbahlG_4dC-4" target="lHBKXWLrEfhbahlG_4dC-11" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-4" value="&lt;div style=&quot;text-align: center;&quot;&gt;Secp256k1&lt;br&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" vertex="1" parent="1">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-4" value="&lt;div style=&quot;text-align: center;&quot;&gt;Secp256k1&lt;br&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1420" y="-1121.5" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-5" 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;" edge="1" parent="1" source="lHBKXWLrEfhbahlG_4dC-1" target="lHBKXWLrEfhbahlG_4dC-4">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-5" 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="lHBKXWLrEfhbahlG_4dC-1" target="lHBKXWLrEfhbahlG_4dC-4" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-6" value="seed" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="lHBKXWLrEfhbahlG_4dC-5">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-6" value="seed" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="lHBKXWLrEfhbahlG_4dC-5" vertex="1" connectable="0">
           <mxGeometry x="0.0056" y="1" relative="1" as="geometry">
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-7" value="SeedRand-Scan&lt;br&gt;512 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-7" value="SeedRand-Scan&lt;br&gt;512 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
           <mxGeometry x="-1600" y="-1078" width="130" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-14" 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;" edge="1" parent="1" source="lHBKXWLrEfhbahlG_4dC-8" target="lHBKXWLrEfhbahlG_4dC-12">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-14" 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="lHBKXWLrEfhbahlG_4dC-8" target="lHBKXWLrEfhbahlG_4dC-12" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-8" value="&lt;div style=&quot;text-align: center;&quot;&gt;Secp256k1&lt;br&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" vertex="1" parent="1">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-8" value="&lt;div style=&quot;text-align: center;&quot;&gt;Secp256k1&lt;br&gt;&lt;/div&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1420" y="-1080" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-9" 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;" edge="1" parent="1" source="lHBKXWLrEfhbahlG_4dC-7" target="lHBKXWLrEfhbahlG_4dC-8">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-9" 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="lHBKXWLrEfhbahlG_4dC-7" target="lHBKXWLrEfhbahlG_4dC-8" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-10" value="seed" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="lHBKXWLrEfhbahlG_4dC-9">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-10" value="seed" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="lHBKXWLrEfhbahlG_4dC-9" vertex="1" connectable="0">
           <mxGeometry x="0.0056" y="1" relative="1" as="geometry">
             <mxPoint as="offset" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-11" value="SpendKey" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-11" value="SpendPrivKey" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-1260" y="-1121.5" width="120" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="lHBKXWLrEfhbahlG_4dC-12" value="SpendKey" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+        <mxCell id="lHBKXWLrEfhbahlG_4dC-12" value="ScanPrivKey" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
           <mxGeometry x="-1260" y="-1080" width="120" height="30" as="geometry" />
         </mxCell>
       </root>
diff --git a/doc/diagrams/KeyGen.png b/doc/diagrams/KeyGen.png
index b630e39..baf31b4 100644
Binary files a/doc/diagrams/KeyGen.png and b/doc/diagrams/KeyGen.png differ