diff --git a/doc/ClientDataStorage-Specs.md b/doc/ClientDataStorage-Specs.md
index b23d1ca..1ccfa86 100644
--- a/doc/ClientDataStorage-Specs.md
+++ b/doc/ClientDataStorage-Specs.md
@@ -63,20 +63,6 @@ pseudo-code:
 
 ### 4.2. <a name='Peers'></a>Peers
 
-
-Le cache est constitué de 2 parties :
-
-1. `public` :
-   * Liste partagée des relais avec les relais (agrégée au fil des relais découverts par le partage des listes de relais dans les messages).
-   * L'historique des pings des relais (timestamp, valeur du ping, relais concerné).
-   * L'historique de message reçus ne satisfaisant pas à l'arbitrage (timestamp, hash du message, relais concerné).
-   * L'historique de message envoyés sans retour d'une transaction Silent Payment (SP).
-2. `private` :
-   * Liste non partagée des relais (agrégée à partir de relais communiqués de façon confidentielle).
-   * L'historique des pings des relais (timestamp, valeur du ping, relais concerné).
-   * L'historique de message reçus ne satisfaisant pas à l'arbitrage (timestamp, hash du message, relais concerné).
-   * L'historique de message envoyés sans retour d'une transaction Silent Payment (SP).
-
 pseudo-code:
 
 ```json
@@ -141,15 +127,6 @@ pseudo-code:
 
 ### 4.3. <a name='Process'></a>Process
 
-
-1. `public` :
-   * Liste partagée des `ItemProcess` avec les relais (agrégée au fil des relais découverts par le partage des listes de `ItemProcess` dans les messages).
-   * Liste partagée des `ItemProcess` complets reçus depuis les mises à jour des parties prenantes.
-2. `private` :
-   * Liste non partagée des `ItemProcess` (agrégée à partir de `ItemProcess` communiqués de façon confidentielle).
-   * Liste non partagée des `ItemProcess` complets reçus depuis les mises à jour des parties prenantes.
-
-
 pseudo-code:
 
 ```json
@@ -653,15 +630,6 @@ pseudo-code:
 
 ### 4.4. <a name='Messages'></a>Messages
 
-
-* MessageHashList: Hashs des objets `Message`.
-* MessageConnectHashList: Hashs des objets `MessageConnect` (vide pour les clients).
-* MessageDataEncHashList: Hashs de la donnée encryptée dans les objets `Message`.
-* RequestPcdHashList: Hashs des `RequestPcd` une fois déchiffrés des objets Message `Message`, avec le hash du message correspondant (vide pour les relais) et état actuel de la collecte des `RequestPrd` correspondants.
-* RequestPrdHashList: Hashs des `RequestPrd` une fois déchiffrés des objets Message `Message`, avec le hash du message correspondant et l'id de la transaction Silent Payment (SP) correspondante (vide pour les relais).
-* TxFaucetIdList: Liste des `transaction SP` du faucet.
-* TxSpIdList: Liste des `transaction SP` reçues.
-
 pseudo-code:
 
 ```json
@@ -691,7 +659,8 @@ pseudo-code:
     "ip": "",
     "port": "",
     "timestamp": 0,
-    "sender": false
+    "sender": false,
+    "validation_status": "pending|ok|ko"
   }],
 }]
 
@@ -1082,9 +1051,507 @@ pseudo-code:
 
 pseudo-code:
 
+```json
+[
+  "public":
 ```json
 [
   {
+    "hash": "",
+    "item": {
+      "uuid": "",
+      "version": 0,
+      "item_type": "",
+      "pagination_number_per_request_pcd": 0,
+      "metadata_contract_public": {
+        "metadata": {
+          "tag_list": [
+            ""
+          ],
+          "zone_list": [
+            ""
+          ],
+          "label_list": [
+            ""
+          ],
+          "ref_list": [
+            ""
+          ],
+          "data_list": [
+            {}
+          ],
+          "amount": {
+            "timestamp": 0,
+            "change_source_list": [
+              ""
+            ],
+            "amount_cent": 0,
+            "amount_unit": "",
+            "amount_unit_ref": ""
+          },
+          "number": {
+            "fixed_state": true,
+            "number": 0,
+            "number_unit": ""
+          },
+          "render_template_list": [
+            {}
+          ],
+          "legal_text_list": [
+            ""
+          ],
+          "key_list": [
+            ""
+          ]
+        }
+      },
+      "metadata_role_confidential": {
+        "metadata": {
+          "tag_list": [
+            ""
+          ],
+          "zone_list": [
+            ""
+          ],
+          "label_list": [
+            ""
+          ],
+          "ref_list": [
+            ""
+          ],
+          "data_list": [
+            {}
+          ],
+          "amount": {
+            "timestamp": 0,
+            "change_source_list": [
+              ""
+            ],
+            "amount_cent": 0,
+            "amount_unit": "",
+            "amount_unit_ref": ""
+          },
+          "number": {
+            "fixed_state": true,
+            "number": 0,
+            "number_unit": ""
+          },
+          "render_template_list": [
+            {}
+          ],
+          "legal_text_list": [
+            ""
+          ],
+          "key_list": [
+            ""
+          ]
+        }
+      }
+    },
+    "item_process_public_attribute_group": {
+      "roles_group": {
+        "role_peer": {
+          "item_name": "",
+          "role": {
+            "item": {
+              "uuid": "",
+              "version": 0,
+              "item_type": "",
+              "pagination_number_per_request_pcd": 0,
+              "metadata_contract_public": {
+                "metadata": {
+                  "tag_list": [
+                    ""
+                  ],
+                  "zone_list": [
+                    ""
+                  ],
+                  "label_list": [
+                    ""
+                  ],
+                  "ref_list": [
+                    ""
+                  ],
+                  "data_list": [
+                    {}
+                  ],
+                  "amount": {
+                    "timestamp": 0,
+                    "change_source_list": [
+                      ""
+                    ],
+                    "amount_cent": 0,
+                    "amount_unit": "",
+                    "amount_unit_ref": ""
+                  },
+                  "number": {
+                    "fixed_state": true,
+                    "number": 0,
+                    "number_unit": ""
+                  },
+                  "render_template_list": [
+                    {}
+                  ],
+                  "legal_text_list": [
+                    ""
+                  ],
+                  "key_list": [
+                    ""
+                  ]
+                }
+              },
+              "metadata_role_confidential": {
+                "metadata": {
+                  "tag_list": [
+                    ""
+                  ],
+                  "zone_list": [
+                    ""
+                  ],
+                  "label_list": [
+                    ""
+                  ],
+                  "ref_list": [
+                    ""
+                  ],
+                  "data_list": [
+                    {}
+                  ],
+                  "amount": {
+                    "timestamp": 0,
+                    "change_source_list": [
+                      ""
+                    ],
+                    "amount_cent": 0,
+                    "amount_unit": "",
+                    "amount_unit_ref": ""
+                  },
+                  "number": {
+                    "fixed_state": true,
+                    "number": 0,
+                    "number_unit": ""
+                  },
+                  "render_template_list": [
+                    {}
+                  ],
+                  "legal_text_list": [
+                    ""
+                  ],
+                  "key_list": [
+                    ""
+                  ]
+                }
+              }
+            },
+            "sp_output_salt_enc": "",
+            "required_2fa": true,
+            "validation_timeout": 0,
+            "condition_prd_address_set_list": [
+              {
+                "request_prd_type": "",
+                "from_role": "",
+                "request_prd_sp_address_list": [""],
+                "request_prd_sp_address_required_list": [""],
+                "request_prd_sp_address_quota": 0,
+                "request_prd_value_ok_list": [""],
+                "request_prd_value_ko_list": [""],
+                "request_prd_value_none_list": [""],
+                "request_prd_value_auto_ok": true,
+                "request_prd_value_auto_ko": true,
+                "request_prd_value_auto_none": true,
+                "request_prd_sp_address_value_min": 0,
+                "request_prd_sp_address_value_min_ok": true,
+                "request_prd_sp_adddress_value_ok_min_per": 0,
+                "request_prd_sp_address_value_ok_max": 0,
+                "request_prd_sp_adderss_value_ko_max_per": 0,
+                "request_prd_sp_address_value_ko_max": 0,
+                "request_prd_sp_address_value_none_max": 0,
+                "request_prd_sp_adderss_value_none_max_per": 0,
+                "request_prd_sp_address_score_min": 0,
+                "request_prd_sp_address_score_min_min_required": 0,
+                "request_prd_sp_address_score_min_min_ok": true,
+                "request_prd_sp_address_score_min_min_per": 0
+              }
+            ],
+            "condition_publish": [
+              {
+                "request_prd_type": "",
+                "request_pcd_data_size_max_unit": "",
+                "request_pcd_data_size_max_total": 0,
+                "request_pcd_number_min": 0,
+                "request_pcd_number_max": 0,
+                "request_pcd_amount_max_total": {
+                    "timestamp": 0,
+                    "change_source_list": [
+                      ""
+                    ],
+                    "amount_cent": 0,
+                    "amount_unit": "",
+                    "amount_unit_ref": ""
+                  },
+                "request_prd_waiting_timeout": 0,
+                "request_pcd_waiting_timeout": 0
+              }
+            ],
+            "condition_cap_list": [
+              {
+                "request_prd_type": "",
+                "transaction_mode": {
+                  "value": {
+                    "timestamp": 0,
+                    "change_source_list": [
+                      ""
+                    ],
+                    "amount_cent": 0,
+                    "amount_unit": "",
+                    "amount_unit_ref": ""
+                  },
+                  "hash_ok_list": [""],
+                  "hash_ko_list": [""],
+                  "hash_none_list": [""],
+                  "from_list": [""],
+                  "from_type": "",
+                  "from_method": "",
+                  "to_list": [""],
+                  "to_type": "",
+                  "to_method": ""
+                },
+                "payment_proof_validation": {
+                  "request_prd_type": "",
+                  "from_role": "",
+                  "request_prd_sp_address_list": [""],
+                  "request_prd_sp_address_required_list": [""],
+                  "request_prd_sp_address_quota": 0,
+                  "request_prd_value_ok_list": [""],
+                  "request_prd_value_ko_list": [""],
+                  "request_prd_value_none_list": [""],
+                  "request_prd_value_auto_ok": true,
+                  "request_prd_value_auto_ko": true,
+                  "request_prd_value_auto_none": true,
+                  "request_prd_sp_address_value_min": 0,
+                  "request_prd_sp_address_value_min_ok": true,
+                  "request_prd_sp_adddress_value_ok_min_per": 0,
+                  "request_prd_sp_address_value_ok_max": 0,
+                  "request_prd_sp_adderss_value_ko_max_per": 0,
+                  "request_prd_sp_address_value_ko_max": 0,
+                  "request_prd_sp_address_value_none_max": 0,
+                  "request_prd_sp_adderss_value_none_max_per": 0,
+                  "request_prd_sp_address_score_min": 0,
+                  "request_prd_sp_address_score_min_min_required": 0,
+                  "request_prd_sp_address_score_min_min_ok": true,
+                  "request_prd_sp_address_score_min_min_per": 0
+                }
+              }
+            ],
+            "condition_payment_list": [
+              {
+                "request_prd_type": "",
+                "transaction_mode": {
+                  "value": "",
+                  "hash_ok_list": [""],
+                  "hash_ko_list": [""],
+                  "hash_none_list": [""],
+                  "from_list": [""],
+                  "from_type": "",
+                  "from_method": "",
+                  "to_list": [""],
+                  "to_type": "",
+                  "to_method": ""
+                },
+                "payment_proof_validation":  {
+                  "request_prd_type": "",
+                  "from_role": "",
+                  "request_prd_sp_address_list": [""],
+                  "request_prd_sp_address_required_list": [""],
+                  "request_prd_sp_address_quota": 0,
+                  "request_prd_value_ok_list": [""],
+                  "request_prd_value_ko_list": [""],
+                  "request_prd_value_none_list": [""],
+                  "request_prd_value_auto_ok": true,
+                  "request_prd_value_auto_ko": true,
+                  "request_prd_value_auto_none": true,
+                  "request_prd_sp_address_value_min": 0,
+                  "request_prd_sp_address_value_min_ok": true,
+                  "request_prd_sp_adddress_value_ok_min_per": 0,
+                  "request_prd_sp_address_value_ok_max": 0,
+                  "request_prd_sp_adderss_value_ko_max_per": 0,
+                  "request_prd_sp_address_value_ko_max": 0,
+                  "request_prd_sp_address_value_none_max": 0,
+                  "request_prd_sp_adderss_value_none_max_per": 0,
+                  "request_prd_sp_address_score_min": 0,
+                  "request_prd_sp_address_score_min_min_required": 0,
+                  "request_prd_sp_address_score_min_min_ok": true,
+                  "request_prd_sp_address_score_min_min_per": 0
+                },
+                "condition_deposit_list": [{
+                  "request_prd_type": "",
+                  "transaction_mode": {
+                    "value": "",
+                    "hash_ok_list": [""],
+                    "hash_ko_list": [""],
+                    "hash_none_list": [""],
+                    "from_list": [""],
+                    "from_type": "",
+                    "from_method": "",
+                    "to_list": [""],
+                    "to_type": "",
+                    "to_method": ""
+                  },
+                  "payment_proof_validation":  {
+                    "request_prd_type": "",
+                    "from_role": "",
+                    "request_prd_sp_address_list": [""],
+                    "request_prd_sp_address_required_list": [""],
+                    "request_prd_sp_address_quota": 0,
+                    "request_prd_value_ok_list": [""],
+                    "request_prd_value_ko_list": [""],
+                    "request_prd_value_none_list": [""],
+                    "request_prd_value_auto_ok": true,
+                    "request_prd_value_auto_ko": true,
+                    "request_prd_value_auto_none": true,
+                    "request_prd_sp_address_value_min": 0,
+                    "request_prd_sp_address_value_min_ok": true,
+                    "request_prd_sp_adddress_value_ok_min_per": 0,
+                    "request_prd_sp_address_value_ok_max": 0,
+                    "request_prd_sp_adderss_value_ko_max_per": 0,
+                    "request_prd_sp_address_value_ko_max": 0,
+                    "request_prd_sp_address_value_none_max": 0,
+                    "request_prd_sp_adderss_value_none_max_per": 0,
+                    "request_prd_sp_address_score_min": 0,
+                    "request_prd_sp_address_score_min_min_required": 0,
+                    "request_prd_sp_address_score_min_min_ok": true,
+                    "request_prd_sp_address_score_min_min_per": 0
+                  }
+                }]
+              }
+            ],
+            "condition_commitment_list": [
+              {
+                "request_prd_type": "",
+                "transaction_mode": {
+                  "value": "",
+                  "hash_ok_list": [""],
+                  "hash_ko_list": [""],
+                  "hash_none_list": [""],
+                  "from_list": [""],
+                  "from_type": "",
+                  "from_method": "",
+                  "to_list": [""],
+                  "to_type": "",
+                  "to_method": ""
+                },
+                "payment_proof_validation":  {
+                  "request_prd_type": "",
+                  "from_role": "",
+                  "request_prd_sp_address_list": [""],
+                  "request_prd_sp_address_required_list": [""],
+                  "request_prd_sp_address_quota": 0,
+                  "request_prd_value_ok_list": [""],
+                  "request_prd_value_ko_list": [""],
+                  "request_prd_value_none_list": [""],
+                  "request_prd_value_auto_ok": true,
+                  "request_prd_value_auto_ko": true,
+                  "request_prd_value_auto_none": true,
+                  "request_prd_sp_address_value_min": 0,
+                  "request_prd_sp_address_value_min_ok": true,
+                  "request_prd_sp_adddress_value_ok_min_per": 0,
+                  "request_prd_sp_address_value_ok_max": 0,
+                  "request_prd_sp_adderss_value_ko_max_per": 0,
+                  "request_prd_sp_address_value_ko_max": 0,
+                  "request_prd_sp_address_value_none_max": 0,
+                  "request_prd_sp_adderss_value_none_max_per": 0,
+                  "request_prd_sp_address_score_min": 0,
+                  "request_prd_sp_address_score_min_min_required": 0,
+                  "request_prd_sp_address_score_min_min_ok": true,
+                  "request_prd_sp_address_score_min_min_per": 0
+                }
+              }
+            ],
+            "condition_attribute_encryption_list": [
+              {
+                "payment_proof_validation":  {
+                  "request_prd_type": "",
+                  "from_role": "",
+                  "request_prd_sp_address_list": [""],
+                  "request_prd_sp_address_required_list": [""],
+                  "request_prd_sp_address_quota": 0,
+                  "request_prd_value_ok_list": [""],
+                  "request_prd_value_ko_list": [""],
+                  "request_prd_value_none_list": [""],
+                  "request_prd_value_auto_ok": true,
+                  "request_prd_value_auto_ko": true,
+                  "request_prd_value_auto_none": true,
+                  "request_prd_sp_address_value_min": 0,
+                  "request_prd_sp_address_value_min_ok": true,
+                  "request_prd_sp_adddress_value_ok_min_per": 0,
+                  "request_prd_sp_address_value_ok_max": 0,
+                  "request_prd_sp_adderss_value_ko_max_per": 0,
+                  "request_prd_sp_address_value_ko_max": 0,
+                  "request_prd_sp_address_value_none_max": 0,
+                  "request_prd_sp_adderss_value_none_max_per": 0,
+                  "request_prd_sp_address_score_min": 0,
+                  "request_prd_sp_address_score_min_min_required": 0,
+                  "request_prd_sp_address_score_min_min_ok": true,
+                  "request_prd_sp_address_score_min_min_per": 0
+                }
+              }
+            ],
+            "condition_orchestration": [
+              {
+                "request_prd_type": "",
+                "role_ok": "",
+                "role_ko": "",
+                "payment_proof_validation":  {
+                  "request_prd_type": "",
+                  "from_role": "",
+                  "request_prd_sp_address_list": [""],
+                  "request_prd_sp_address_required_list": [""],
+                  "request_prd_sp_address_quota": 0,
+                  "request_prd_value_ok_list": [""],
+                  "request_prd_value_ko_list": [""],
+                  "request_prd_value_none_list": [""],
+                  "request_prd_value_auto_ok": true,
+                  "request_prd_value_auto_ko": true,
+                  "request_prd_value_auto_none": true,
+                  "request_prd_sp_address_value_min": 0,
+                  "request_prd_sp_address_value_min_ok": true,
+                  "request_prd_sp_adddress_value_ok_min_per": 0,
+                  "request_prd_sp_address_value_ok_max": 0,
+                  "request_prd_sp_adderss_value_ko_max_per": 0,
+                  "request_prd_sp_address_value_ko_max": 0,
+                  "request_prd_sp_address_value_none_max": 0,
+                  "request_prd_sp_adderss_value_none_max_per": 0,
+                  "request_prd_sp_address_score_min": 0,
+                  "request_prd_sp_address_score_min_min_required": 0,
+                  "request_prd_sp_address_score_min_min_ok": true,
+                  "request_prd_sp_address_score_min_min_per": 0
+                }
+              }
+            ],
+            "role_succession": "",
+            "role_resolve": "",
+            "role_renew": ""
+          }
+        },
+        "role_member": {
+          "item_name": "",
+          "role": {}
+        },
+        "role_process": {
+          "item_name": "",
+          "role": {}
+        },
+        "role_artefact_list": [
+          {
+            "item_name": "",
+            "role": {}
+          }
+        ]
+      }
+    }
+  }
+],
+  "private": {
     "hash_public": "",
     "item": {
       "metadata_private": {
diff --git a/doc/diagrams/.$WalletCreate.drawio.bkp b/doc/diagrams/.$WalletCreate.drawio.bkp
index ea34fc0..bf2f396 100644
--- a/doc/diagrams/.$WalletCreate.drawio.bkp
+++ b/doc/diagrams/.$WalletCreate.drawio.bkp
@@ -1,11 +1,11 @@
-<mxfile host="Electron" modified="2024-03-08T10:11:32.271Z" 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="YTSSUKPodLDdV_Q-qTGr" version="23.1.5" type="device">
+<mxfile host="Electron" modified="2024-03-08T16:07:52.566Z" 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="p8G1iqsPdFVrM07FU_91" version="23.1.5" type="device">
   <diagram id="bWoO5ACGZIaXrIiKNTKd" name="Page-1">
-    <mxGraphModel dx="3906" dy="2039" 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="3915" dy="2039" 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="NZOLWawKIEO-KyV3UFa8-299" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2199" y="-197.96" width="782.04" height="234" as="geometry" />
+          <mxGeometry x="-2070" y="-36.03999999999999" width="680" height="137.96" as="geometry" />
         </mxCell>
         <mxCell id="274" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="2" target="4" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -22,7 +22,7 @@
         <mxCell id="5" value="Part1&lt;br&gt;128 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
           <mxGeometry x="-1089" y="38" width="88.8134519572954" height="28.999999999999993" as="geometry" />
         </mxCell>
-        <mxCell id="HEAZNrv7IqFEUBU4v7G9-285" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" target="258" edge="1">
+        <mxCell id="HEAZNrv7IqFEUBU4v7G9-285" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" target="258" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-1090" y="235" as="sourcePoint" />
           </mxGeometry>
@@ -121,19 +121,23 @@
         <mxCell id="181" value="ImageRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontStyle=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
           <mxGeometry x="-772" y="252.71000000000004" width="110" height="29" as="geometry" />
         </mxCell>
-        <mxCell id="259" 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="189" target="202" edge="1">
+        <mxCell id="259" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="189" target="202" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1178" y="333" />
+              <mxPoint x="-1171" y="390" />
+              <mxPoint x="-1171" y="390" />
+              <mxPoint x="-1171" y="491" />
             </Array>
+            <mxPoint x="-1190" y="390" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="189" value="PreId" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1220.891944604848" y="307" width="88.8134519572954" height="28.999999999999993" as="geometry" />
+          <mxGeometry x="-1215.921944604848" y="345.99999999999994" width="88.8134519572954" height="28.999999999999993" as="geometry" />
         </mxCell>
-        <mxCell id="190" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.56;exitY=1.01;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitPerimeter=0;" parent="1" source="258" target="189" edge="1">
+        <mxCell id="190" 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="258" target="189" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-367.91" y="256.15" as="targetPoint" />
+            <Array as="points" />
           </mxGeometry>
         </mxCell>
         <mxCell id="192" value="Shard" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
@@ -144,7 +148,8 @@
             <mxPoint x="-1184" y="426" as="targetPoint" />
             <Array as="points">
               <mxPoint x="-449" y="392" />
-              <mxPoint x="-1178" y="392" />
+              <mxPoint x="-1170" y="392" />
+              <mxPoint x="-1170" y="491" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -173,11 +178,12 @@
         <mxCell id="198" value="SpAddress" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
           <mxGeometry x="-220.55953219633375" y="243.29000000000002" width="88.8134519572954" height="30.709999999999994" as="geometry" />
         </mxCell>
-        <mxCell id="205" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="199" target="202" edge="1">
+        <mxCell id="205" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.553;entryY=0.011;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="199" target="202" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-166" y="392" />
-              <mxPoint x="-1178" y="392" />
+              <mxPoint x="-1170" y="392" />
+              <mxPoint x="-1170" y="491" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -258,8 +264,8 @@
         <mxCell id="245" value="Relay WS" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
           <mxGeometry x="-1172.9" y="628.71" width="60" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="258" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PwdHash&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1246.55" y="219.71" width="125" height="30" as="geometry" />
+        <mxCell id="258" value="SHA256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
+          <mxGeometry x="-1234.0199999999998" y="274" width="125" height="30" as="geometry" />
         </mxCell>
         <mxCell id="261" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="260" target="2" edge="1">
           <mxGeometry relative="1" as="geometry">
@@ -444,70 +450,76 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-284" value="SeedRandomInital&lt;br&gt;512 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-2175.55" y="-23.960000000000008" width="161.76" height="40" as="geometry" />
+          <mxGeometry x="-2059.32" y="47.91999999999999" width="161.76" height="40" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-292" 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="NZOLWawKIEO-KyV3UFa8-285" target="NZOLWawKIEO-KyV3UFa8-290" edge="1">
-          <mxGeometry relative="1" as="geometry" />
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="-1698.25" y="67.92000000000002" />
+              <mxPoint x="-1698.25" y="45.920000000000016" />
+            </Array>
+          </mxGeometry>
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-285" value="&lt;b&gt;privKey&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1940.5300000000002" y="-23.960000000000008" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-1864.3000000000002" y="47.91999999999999" width="124.36" height="39" as="geometry" />
         </mxCell>
-        <mxCell id="NZOLWawKIEO-KyV3UFa8-293" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="NZOLWawKIEO-KyV3UFa8-287" target="NZOLWawKIEO-KyV3UFa8-290" edge="1">
+        <mxCell id="NZOLWawKIEO-KyV3UFa8-293" 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="NZOLWawKIEO-KyV3UFa8-287" target="NZOLWawKIEO-KyV3UFa8-290" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1706.17" y="16.039999999999992" as="targetPoint" />
+            <mxPoint x="-1634.42" y="153.96" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1776.17" y="-123.96000000000001" />
-              <mxPoint x="-1776.17" y="-63.96000000000001" />
+              <mxPoint x="-1698.25" y="13.920000000000016" />
+              <mxPoint x="-1698.25" y="45.920000000000016" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-287" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PwdHash&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1935.88" y="-143.96" width="125" height="40" as="geometry" />
+          <mxGeometry x="-1864.13" y="-6.039999999999992" width="125" height="40" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-296" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="NZOLWawKIEO-KyV3UFa8-290" target="NZOLWawKIEO-KyV3UFa8-294" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-290" value="AES-GCM-256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1736.17" y="-83.96000000000001" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1664.42" y="25.920000000000016" width="137.39" height="40" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-294" value="&lt;b&gt;privKey_enc&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1557.92" y="-82.96000000000001" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-1486.17" y="26.920000000000016" width="86.17" height="39" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-300" value="&lt;b&gt;KeyEncryption&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2188.3199999999997" y="-187.96" width="110" height="30" as="geometry" />
+          <mxGeometry x="-2069.9999999999995" y="-36.03999999999999" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-284" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2199" y="46.03999999999999" width="780.36" height="233" as="geometry" />
+          <mxGeometry x="-2068.32" y="112.92" width="678.32" height="143.96" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-288" 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-289" target="XqTc7s29-gL46L3V4mSs-295" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-289" value="&lt;b&gt;part&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1940.5300000000004" y="225.04" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-2058.0000000000005" y="202.51" width="124.36" height="39" as="geometry" />
         </mxCell>
-        <mxCell id="XqTc7s29-gL46L3V4mSs-292" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="XqTc7s29-gL46L3V4mSs-293" target="XqTc7s29-gL46L3V4mSs-295" edge="1">
+        <mxCell id="XqTc7s29-gL46L3V4mSs-292" 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-293" target="XqTc7s29-gL46L3V4mSs-295" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1706.17" y="265.03999999999996" as="targetPoint" />
+            <mxPoint x="-1823.64" y="309.26" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1776.17" y="125.03999999999999" />
-              <mxPoint x="-1776.17" y="185.04" />
+              <mxPoint x="-1933.4700000000003" y="169.22" />
+              <mxPoint x="-1893.47" y="169.22" />
+              <mxPoint x="-1893.47" y="195.22" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-293" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PwdHash&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1941.1699999999998" y="102.03999999999999" width="125" height="40" as="geometry" />
+          <mxGeometry x="-2058.64" y="146.26" width="125" height="40" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-294" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="XqTc7s29-gL46L3V4mSs-295" target="XqTc7s29-gL46L3V4mSs-296" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-295" value="AES-GCM-256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1736.17" y="165.04" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1853.64" y="175.22" width="137.39" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="XqTc7s29-gL46L3V4mSs-296" value="&lt;b&gt;part_enc&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1557.92" y="166.04" width="124.36" height="39" as="geometry" />
+        <mxCell id="XqTc7s29-gL46L3V4mSs-296" value="&lt;b&gt;part_enc&lt;br&gt;&lt;/b&gt;512 bits (nonce + ciphertext)&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
+          <mxGeometry x="-1675.39" y="175.22" width="157.92" height="39" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-300" value="&lt;b&gt;PartEncryption&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2188.3199999999997" y="56.03999999999999" width="110" height="30" as="geometry" />
+          <mxGeometry x="-2068.3199999999997" y="112.91999999999999" width="110" height="30" as="geometry" />
         </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">
           <mxGeometry relative="1" as="geometry">
@@ -556,53 +568,54 @@
           <mxGeometry x="-1320" y="517" width="60" height="33" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-296" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2199" y="-422.96" width="780.36" height="212.96" as="geometry" />
+          <mxGeometry x="-2069" y="-208.99999999999997" width="679" height="162.96" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-297" 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="U1iS4aTrDNJz4kT7s3QN-302" target="U1iS4aTrDNJz4kT7s3QN-301" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1935.0700000000002" y="-212.96" as="targetPoint" />
+            <mxPoint x="-1815.0700000000002" y="-29" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1969.87" y="-266.96000000000004" />
-              <mxPoint x="-1969.87" y="-302.96000000000004" />
+              <mxPoint x="-1898" y="-83.03999999999999" />
+              <mxPoint x="-1880" y="-83.03999999999999" />
+              <mxPoint x="-1880" y="-119.03999999999999" />
             </Array>
           </mxGeometry>
         </mxCell>
-        <mxCell id="YeFEyNYQkg-0ZjFJJ9BC-284" value="salt" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="U1iS4aTrDNJz4kT7s3QN-297">
+        <mxCell id="YeFEyNYQkg-0ZjFJJ9BC-284" value="salt" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="U1iS4aTrDNJz4kT7s3QN-297" vertex="1" connectable="0">
           <mxGeometry x="-0.3479" y="3" relative="1" as="geometry">
-            <mxPoint x="-11" y="2" as="offset" />
+            <mxPoint x="3" y="2" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-298" 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="U1iS4aTrDNJz4kT7s3QN-299" target="U1iS4aTrDNJz4kT7s3QN-301" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1969.87" y="-342.96000000000004" />
-              <mxPoint x="-1969.87" y="-302.96000000000004" />
+              <mxPoint x="-1880" y="-159.04" />
+              <mxPoint x="-1880" y="-119.03999999999999" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-299" 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="-2179.67" y="-362.96000000000004" width="164.6" height="40" as="geometry" />
+          <mxGeometry x="-2059.67" y="-179.00000000000003" width="164.6" height="40" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-301" value="SCRYPT" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1939.58" y="-322.96000000000004" width="125" height="40" as="geometry" />
+          <mxGeometry x="-1859.58" y="-139.00000000000003" width="125" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="U1iS4aTrDNJz4kT7s3QN-302" value="SeedRandom&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-2179.67" y="-286.96000000000004" width="161.76" height="44" as="geometry" />
+        <mxCell id="U1iS4aTrDNJz4kT7s3QN-302" value="SeedRandom&lt;br&gt;256 bits -&amp;gt;&amp;nbsp;base64" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+          <mxGeometry x="-2059.67" y="-103.00000000000003" width="161.76" height="44" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-303" value="&lt;b&gt;PwdHash&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2193" y="-412.96000000000004" width="110" height="30" as="geometry" />
+          <mxGeometry x="-2070" y="-209.00000000000003" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-305" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fontColor=#333333;fillColor=#f5f5f5;strokeColor=#666666;" parent="1" vertex="1">
-          <mxGeometry x="-2199" y="313.03999999999996" width="28.93" height="28.93" as="geometry" />
+          <mxGeometry x="-2058.67" y="282.06999999999994" width="28.93" height="28.93" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-307" value="Relay - side chain node not required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2163.32" y="311.97" width="214.32" height="30" as="geometry" />
+          <mxGeometry x="-2022.9900000000002" y="281" width="214.32" height="30" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-310" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="-2200" y="348.0400000000001" width="28.93" height="28.93" as="geometry" />
+          <mxGeometry x="-2059.67" y="317.07000000000005" width="28.93" height="28.93" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-311" value="Relay - side chain node required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2164.32" y="346.97000000000014" width="214.32" height="30" as="geometry" />
+          <mxGeometry x="-2023.9900000000002" y="316.0000000000001" width="214.32" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KGCLxLdSfCaxDo2TsfCf-284" value="&lt;b&gt;`item_member_enc_by_sp_shared_secret`&lt;/b&gt;&lt;br&gt;(only for member managers)" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
           <mxGeometry x="-1320" y="423" width="260" height="29" as="geometry" />
@@ -758,23 +771,29 @@
         <mxCell id="KGCLxLdSfCaxDo2TsfCf-345" value="SeedRand2&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privEncrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-450" y="112" width="137.39" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="YAJWOaMnfQJNXjO860FT-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.468;entryY=0.025;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="YAJWOaMnfQJNXjO860FT-287" target="YAJWOaMnfQJNXjO860FT-286" edge="1">
+        <mxCell id="YAJWOaMnfQJNXjO860FT-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="YAJWOaMnfQJNXjO860FT-287" target="YAJWOaMnfQJNXjO860FT-286" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="YAJWOaMnfQJNXjO860FT-285" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" target="YAJWOaMnfQJNXjO860FT-287" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1814.88" y="-302.96" as="sourcePoint" />
+            <mxPoint x="-1734.88" y="-118.99999999999997" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="YAJWOaMnfQJNXjO860FT-286" value="hash" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1774.5" y="-258.96000000000004" width="123.1" height="40" as="geometry" />
+          <mxGeometry x="-1490" y="-138.99999999999997" width="90" height="40" as="geometry" />
         </mxCell>
         <mxCell id="YAJWOaMnfQJNXjO860FT-287" value="SHA256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1785.88" y="-322.96" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1665.13" y="-138.99999999999997" width="137.39" height="40" as="geometry" />
         </mxCell>
         <mxCell id="mM1gybHHXk3-ZNENjHdL-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.224;entryY=0.065;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="8" target="181" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
+        <mxCell id="xSIgGbmu95QqtSGV3vQQ-285" 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="xSIgGbmu95QqtSGV3vQQ-284" target="258">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="xSIgGbmu95QqtSGV3vQQ-284" value="Password&lt;br&gt;18 characters" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+          <mxGeometry x="-1229.39" y="35" width="115.75" height="32" as="geometry" />
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
diff --git a/doc/diagrams/.$WalletRecover.drawio.bkp b/doc/diagrams/.$WalletRecover.drawio.bkp
index 40fa5c5..1fb86b2 100644
--- a/doc/diagrams/.$WalletRecover.drawio.bkp
+++ b/doc/diagrams/.$WalletRecover.drawio.bkp
@@ -1,11 +1,11 @@
-<mxfile host="Electron" modified="2024-03-08T15:03:58.468Z" 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="o-59OmzvSLCAlSUTKzY3" version="23.1.5" type="device">
+<mxfile host="Electron" modified="2024-03-11T09:40:50.567Z" 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="W2UqVcuRDYEnYtyEzJRA" version="23.1.5" type="device">
   <diagram name="Page-1" id="nezTab6434Mr3TNqJTht">
-    <mxGraphModel dx="3915" dy="2039" 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="4168" dy="2193" 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="sHT8GTnQFrlxJ-m2nGzn-6" value="WalletCreate" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-855.97" y="-328" width="88.81" height="33" as="geometry" />
+          <mxGeometry x="-855.97" y="-281" width="88.81" height="33" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-7" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-11" target="sHT8GTnQFrlxJ-m2nGzn-23" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -17,7 +17,7 @@
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-11" target="sHT8GTnQFrlxJ-m2nGzn-34" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1353.9" y="0.5000000000002274" as="targetPoint" />
+            <mxPoint x="-1353.9" y="47.50000000000023" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-10" value="OK" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="sHT8GTnQFrlxJ-m2nGzn-9" vertex="1" connectable="0">
@@ -26,7 +26,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-11" value="ImageRecover in cache ?" style="rhombus;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="-1244.5500000000002" y="-386" width="170" height="49" as="geometry" />
+          <mxGeometry x="-1244.5500000000002" y="-339" width="170" height="49" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-19" 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="sHT8GTnQFrlxJ-m2nGzn-23" target="sHT8GTnQFrlxJ-m2nGzn-6" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -39,10 +39,10 @@
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-23" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1071" y="-313" />
-              <mxPoint x="-1295" y="-313" />
+              <mxPoint x="-1071" y="-266" />
+              <mxPoint x="-1295" y="-266" />
             </Array>
-            <mxPoint x="-1294.98" y="-293" as="targetPoint" />
+            <mxPoint x="-1294.98" y="-246" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-22" value="OK" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="sHT8GTnQFrlxJ-m2nGzn-21" vertex="1" connectable="0">
@@ -51,58 +51,58 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-23" value="new device ?" style="rhombus;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="-1070.68" y="-336" width="170" height="49" as="geometry" />
+          <mxGeometry x="-1070.68" y="-289" width="170" height="49" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-25" target="sHT8GTnQFrlxJ-m2nGzn-11" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-25" value="" style="strokeWidth=2;html=1;shape=mxgraph.flowchart.start_2;whiteSpace=wrap;" parent="1" vertex="1">
-          <mxGeometry x="-1169.55" y="-424" width="20" height="20" as="geometry" />
+          <mxGeometry x="-1169.55" y="-377" width="20" height="20" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;labelBackgroundColor=none;fontColor=#000000;entryX=0.501;entryY=0.044;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-29" target="sHT8GTnQFrlxJ-m2nGzn-31" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1374.98" y="-200" as="sourcePoint" />
-            <mxPoint x="-1280" y="-247" as="targetPoint" />
+            <mxPoint x="-1374.98" y="-153" as="sourcePoint" />
+            <mxPoint x="-1280" y="-200" as="targetPoint" />
             <Array as="points" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-29" value="NewDevice" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1354.98" y="-290" width="120" height="33" as="geometry" />
+          <mxGeometry x="-1354.98" y="-243" width="120" height="33" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;labelBackgroundColor=none;fontColor=#000000;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-31" target="sHT8GTnQFrlxJ-m2nGzn-36" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1264.98" y="-189" as="sourcePoint" />
-            <mxPoint x="-1295.03" y="-171" as="targetPoint" />
+            <mxPoint x="-1264.98" y="-142" as="sourcePoint" />
+            <mxPoint x="-1295.03" y="-124" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-31" value="ImageRecoverUpload" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="-1352.89" y="-242.21" width="115.48" height="29" as="geometry" />
+          <mxGeometry x="-1352.89" y="-195.21" width="115.48" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;labelBackgroundColor=none;fontColor=#000000;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-33" target="sHT8GTnQFrlxJ-m2nGzn-34" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1354.98" y="-109.21000000000001" as="sourcePoint" />
-            <mxPoint x="-1294.85" y="-86.99999999999997" as="targetPoint" />
+            <mxPoint x="-1354.98" y="-62.21000000000001" as="sourcePoint" />
+            <mxPoint x="-1294.85" y="-39.99999999999997" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-33" value="Cache" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="-1351.59" y="-155" width="114.62" height="29" as="geometry" />
+          <mxGeometry x="-1351.59" y="-108" width="114.62" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-306" 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="sHT8GTnQFrlxJ-m2nGzn-34" target="sHT8GTnQFrlxJ-m2nGzn-301" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1220" y="-90" />
-              <mxPoint x="-1220" y="-205" />
+              <mxPoint x="-1220" y="-43" />
+              <mxPoint x="-1220" y="-158" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-34" value="WalletRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1349.98" y="-107" width="114.44" height="33" as="geometry" />
+          <mxGeometry x="-1349.98" y="-60" width="114.44" height="33" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-35" 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="sHT8GTnQFrlxJ-m2nGzn-36" target="sHT8GTnQFrlxJ-m2nGzn-33" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-36" value="ImageRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1349.98" y="-198.07999999999998" width="110" height="29" as="geometry" />
+          <mxGeometry x="-1349.98" y="-151.07999999999998" width="110" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-37" 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="sHT8GTnQFrlxJ-m2nGzn-38" target="sHT8GTnQFrlxJ-m2nGzn-39" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -302,7 +302,7 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-297" value="Part1Enc" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1036.07" y="-115.5" width="60" height="30.71" as="geometry" />
+          <mxGeometry x="-1036.07" y="-68.5" width="60" height="30.71" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-336" 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="sHT8GTnQFrlxJ-m2nGzn-298" target="sHT8GTnQFrlxJ-m2nGzn-339" edge="1">
           <mxGeometry relative="1" as="geometry">
@@ -314,90 +314,82 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-298" value="SeedRand1&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-961.73" y="-115.5" width="81.73" height="29" as="geometry" />
-        </mxCell>
-        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-351" 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" target="sHT8GTnQFrlxJ-m2nGzn-341" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-717.0899999999997" y="-30" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="-717" y="40" />
-              <mxPoint x="-641" y="40" />
-            </Array>
-            <mxPoint x="-717.2532740213524" y="-82.78999999999974" as="sourcePoint" />
-          </mxGeometry>
+          <mxGeometry x="-961.73" y="-68.5" width="81.73" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-308" 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="sHT8GTnQFrlxJ-m2nGzn-300" target="sHT8GTnQFrlxJ-m2nGzn-297" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1007" y="-130" />
-              <mxPoint x="-1006" y="-130" />
+              <mxPoint x="-1007" y="-83" />
+              <mxPoint x="-1006" y="-83" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-309" 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="sHT8GTnQFrlxJ-m2nGzn-300" target="sHT8GTnQFrlxJ-m2nGzn-298" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1007" y="-130" />
-              <mxPoint x="-921" y="-130" />
+              <mxPoint x="-1007" y="-83" />
+              <mxPoint x="-921" y="-83" />
             </Array>
-            <mxPoint x="-930" y="-161" as="targetPoint" />
+            <mxPoint x="-930" y="-114" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-359" 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="sHT8GTnQFrlxJ-m2nGzn-325" target="5Ne0HzyGfQl-3uoNr5Rs-33" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-305.4199999999996" y="171.13999999999987" as="targetPoint" />
-            <mxPoint x="-340" y="171.6300000000001" as="sourcePoint" />
+            <mxPoint x="-396.4199999999996" y="171.13999999999987" as="targetPoint" />
+            <mxPoint x="-431" y="171.6300000000001" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="-423" y="150" />
-              <mxPoint x="-330" y="150" />
-              <mxPoint x="-330" y="57" />
+              <mxPoint x="-514" y="150" />
+              <mxPoint x="-430" y="150" />
+              <mxPoint x="-430" y="57" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-360" 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="sHT8GTnQFrlxJ-m2nGzn-325" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-423" y="150" />
-              <mxPoint x="-330" y="150" />
-              <mxPoint x="-330" y="133" />
+              <mxPoint x="-514" y="150" />
+              <mxPoint x="-430" y="150" />
+              <mxPoint x="-430" y="133" />
             </Array>
-            <mxPoint x="-305.4199999999996" y="133.43000000000006" as="targetPoint" />
-            <mxPoint x="-340" y="171.6300000000001" as="sourcePoint" />
+            <mxPoint x="-396.4199999999996" y="133.43000000000006" as="targetPoint" />
+            <mxPoint x="-431" y="171.6300000000001" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="Q8MjV8EZblA_sCvqo5JG-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-325" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-423" y="150" />
-              <mxPoint x="-330" y="150" />
-              <mxPoint x="-330" y="91" />
+              <mxPoint x="-514" y="150" />
+              <mxPoint x="-430" y="150" />
+              <mxPoint x="-430" y="91" />
             </Array>
-            <mxPoint x="-420" y="170" as="sourcePoint" />
-            <mxPoint x="-306" y="91" as="targetPoint" />
+            <mxPoint x="-511" y="170" as="sourcePoint" />
+            <mxPoint x="-397" y="91" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="I9sp5S672SgGMplcR-zX-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-300" target="I9sp5S672SgGMplcR-zX-5" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1007" y="-130" />
-              <mxPoint x="-834" y="-130" />
+              <mxPoint x="-1007" y="-83" />
+              <mxPoint x="-834" y="-83" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-300" value="ImageRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1066.07" y="-175.87" width="118.1" height="29" as="geometry" />
+          <mxGeometry x="-1066.07" y="-128.87" width="118.1" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-312" 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="sHT8GTnQFrlxJ-m2nGzn-301" target="sHT8GTnQFrlxJ-m2nGzn-300" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-301" value="Cache" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="-1066.8899999999999" y="-220" width="118.85" height="29" as="geometry" />
+          <mxGeometry x="-1066.8899999999999" y="-173" width="118.85" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-327" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-284" target="sHT8GTnQFrlxJ-m2nGzn-325" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-218.0564848910808" y="1001.5" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="-423" y="696" />
+              <mxPoint x="-430" y="696" />
+              <mxPoint x="-430" y="150" />
+              <mxPoint x="-514" y="150" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -421,38 +413,35 @@
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-317" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;SHA256&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1218.8500000000001" y="72.21" width="125" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-349" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-322" target="sHT8GTnQFrlxJ-m2nGzn-341" edge="1">
+        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-349" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-322" target="sHT8GTnQFrlxJ-m2nGzn-341" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-496.9999999999998" y="-18.62999999999974" as="sourcePoint" />
             <mxPoint x="-556.1442857142856" y="148.66" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-497" y="-100" />
-              <mxPoint x="-570" y="-100" />
-              <mxPoint x="-570" y="40" />
-              <mxPoint x="-641" y="40" />
+              <mxPoint x="-736" y="-37" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-322" value="Part2Enc" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-497.5299999999999" y="-115.50000000000001" width="103.81" height="29" as="geometry" />
+          <mxGeometry x="-779.4" y="-65.79000000000002" width="103.81" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-328" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-323" target="sHT8GTnQFrlxJ-m2nGzn-326" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-323" value="Shard" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-490.0295321963339" y="72.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
+          <mxGeometry x="-581.0295321963339" y="72.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-324" value="Shard" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-480.0295321963339" y="82.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
+          <mxGeometry x="-571.0295321963339" y="82.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-325" value="Shard" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-467.0295321963339" y="95.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
+          <mxGeometry x="-558.0295321963339" y="95.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
         </mxCell>
-        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-329" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-326" target="sHT8GTnQFrlxJ-m2nGzn-322" edge="1">
+        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-329" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-326" target="sHT8GTnQFrlxJ-m2nGzn-322" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-326" value="Shamir Secret Sharing" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-541.0600000000001" y="13.070000000000007" width="190" height="30" as="geometry" />
+          <mxGeometry x="-632.0600000000001" y="13.070000000000007" width="190" height="30" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-331" value="" style="strokeWidth=2;html=1;shape=mxgraph.flowchart.start_2;whiteSpace=wrap;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
           <mxGeometry x="-965.5899999999999" y="775" width="20" height="20" as="geometry" />
@@ -483,33 +472,31 @@
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-352" 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="sHT8GTnQFrlxJ-m2nGzn-341" target="sHT8GTnQFrlxJ-m2nGzn-342" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-557.1149999999998" y="180" as="sourcePoint" />
-            <mxPoint x="-554.5150000000003" y="200" as="targetPoint" />
+            <mxPoint x="-652.1149999999998" y="180" as="sourcePoint" />
+            <mxPoint x="-649.5150000000003" y="200" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-341" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PartDecrypt&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-709.81" y="70.00000000000001" width="137.39" height="30" as="geometry" />
+          <mxGeometry x="-804.81" y="70.00000000000001" width="137.39" height="30" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-344" 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="sHT8GTnQFrlxJ-m2nGzn-342" target="sHT8GTnQFrlxJ-m2nGzn-343" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-638" y="160" />
+              <mxPoint x="-734" y="160" />
               <mxPoint x="-832" y="160" />
-              <mxPoint x="-832" y="169" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-342" value="Part2" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-697.4399999999999" y="120.00000000000003" width="117.85" height="30.71" as="geometry" />
+          <mxGeometry x="-792.4399999999999" y="120.00000000000003" width="117.85" height="30.71" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-364" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;strokeColor=#999999;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-343" target="sHT8GTnQFrlxJ-m2nGzn-313" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-790.7984697508899" y="170.5" as="sourcePoint" />
             <mxPoint x="-970" y="1050" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-771" y="194" />
-              <mxPoint x="-414" y="194" />
-              <mxPoint x="-414" y="1065" />
+              <mxPoint x="-580" y="193" />
+              <mxPoint x="-580" y="747" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -789,29 +776,16 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-31" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyMainSpend&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privDecrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-306" y="85.19" width="149.75" height="30" as="geometry" />
+          <mxGeometry x="-397" y="85.19" width="149.75" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-32" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyMainScan&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privDecrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-305.14999999999986" y="123.38999999999999" width="148.9" height="30" as="geometry" />
+          <mxGeometry x="-396.14999999999986" y="123.38999999999999" width="148.9" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-33" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRecoverScan&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privDecrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-305.9999999999999" y="42" width="149.75" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="5Ne0HzyGfQl-3uoNr5Rs-35" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-717.2532740213524" y="-111.78999999999974" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="-140" y="173" />
-              <mxPoint x="-140" y="-132" />
-              <mxPoint x="-717" y="-132" />
-            </Array>
-          </mxGeometry>
+          <mxGeometry x="-396.9999999999999" y="42" width="149.75" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-35" value="PCD item_name=member&lt;br&gt;-&amp;gt; ItemMember (sp addess of the user)" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-550" y="158" width="250" height="30.71" as="geometry" />
-        </mxCell>
-        <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-37" value="SeedRand2&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privDecrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-790.9999999999999" y="-112.79" width="149.75" height="30" as="geometry" />
+          <mxGeometry x="-558.03" y="177" width="250" height="30.71" as="geometry" />
         </mxCell>
         <mxCell id="_sUySUgutdZOfC_v2Y1--1" value="SHA256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1654" y="-324" width="137.39" height="40" as="geometry" />
@@ -828,16 +802,22 @@
         <mxCell id="I9sp5S672SgGMplcR-zX-4" value="Relay - side chain node required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
           <mxGeometry x="-2031.3200000000002" y="372.0000000000001" width="214.32" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="I9sp5S672SgGMplcR-zX-6" 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="I9sp5S672SgGMplcR-zX-5" target="sHT8GTnQFrlxJ-m2nGzn-339" edge="1">
+        <mxCell id="I9sp5S672SgGMplcR-zX-6" 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="I9sp5S672SgGMplcR-zX-5" target="sHT8GTnQFrlxJ-m2nGzn-341" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-834" y="40" />
-              <mxPoint x="-990" y="40" />
+              <mxPoint x="-736" y="40" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="I9sp5S672SgGMplcR-zX-5" value="SeedRand2&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-868.58" y="-113.79" width="70" height="29" as="geometry" />
+          <mxGeometry x="-868.58" y="-66.79" width="70" height="29" as="geometry" />
+        </mxCell>
+        <mxCell id="VY5BnqjUr2LHQryPuXbw-2" 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="VY5BnqjUr2LHQryPuXbw-1" target="sHT8GTnQFrlxJ-m2nGzn-317" edge="1">
+          <mxGeometry relative="1" as="geometry" />
+        </mxCell>
+        <mxCell id="VY5BnqjUr2LHQryPuXbw-1" value="Password" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" parent="1" vertex="1">
+          <mxGeometry x="-1200.76" y="-65.79" width="88.81" height="33" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
diff --git a/doc/diagrams/.$WalletRecover.png.bkp b/doc/diagrams/.$WalletRecover.png.bkp
new file mode 100644
index 0000000..f414c35
Binary files /dev/null and b/doc/diagrams/.$WalletRecover.png.bkp differ
diff --git a/doc/diagrams/WalletCreate.drawio b/doc/diagrams/WalletCreate.drawio
index af5f5e7..896bde4 100644
--- a/doc/diagrams/WalletCreate.drawio
+++ b/doc/diagrams/WalletCreate.drawio
@@ -1,11 +1,11 @@
-<mxfile host="Electron" modified="2024-03-08T15:03:03.318Z" 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="s8nL-LjMTsANQAjuJMU6" version="23.1.5" type="device">
+<mxfile host="Electron" modified="2024-03-11T09:37:12.936Z" 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="IkeRU9ynd-DiNQRneAOL" version="23.1.5" type="device">
   <diagram id="bWoO5ACGZIaXrIiKNTKd" name="Page-1">
-    <mxGraphModel dx="3300" dy="1666" 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="3915" dy="2039" 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="NZOLWawKIEO-KyV3UFa8-299" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2199" y="-197.96" width="782.04" height="234" as="geometry" />
+          <mxGeometry x="-2070" y="-36.03999999999999" width="680" height="137.96" as="geometry" />
         </mxCell>
         <mxCell id="274" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="2" target="4" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -450,70 +450,76 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-284" value="SeedRandomInital&lt;br&gt;512 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-2175.55" y="-23.960000000000008" width="161.76" height="40" as="geometry" />
+          <mxGeometry x="-2059.32" y="47.91999999999999" width="161.76" height="40" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-292" 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="NZOLWawKIEO-KyV3UFa8-285" target="NZOLWawKIEO-KyV3UFa8-290" edge="1">
-          <mxGeometry relative="1" as="geometry" />
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="-1698.25" y="67.92000000000002" />
+              <mxPoint x="-1698.25" y="45.920000000000016" />
+            </Array>
+          </mxGeometry>
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-285" value="&lt;b&gt;privKey&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1940.5300000000002" y="-23.960000000000008" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-1864.3000000000002" y="47.91999999999999" width="124.36" height="39" as="geometry" />
         </mxCell>
-        <mxCell id="NZOLWawKIEO-KyV3UFa8-293" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="NZOLWawKIEO-KyV3UFa8-287" target="NZOLWawKIEO-KyV3UFa8-290" edge="1">
+        <mxCell id="NZOLWawKIEO-KyV3UFa8-293" 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="NZOLWawKIEO-KyV3UFa8-287" target="NZOLWawKIEO-KyV3UFa8-290" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1706.17" y="16.039999999999992" as="targetPoint" />
+            <mxPoint x="-1634.42" y="153.96" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1776.17" y="-123.96000000000001" />
-              <mxPoint x="-1776.17" y="-63.96000000000001" />
+              <mxPoint x="-1698.25" y="13.920000000000016" />
+              <mxPoint x="-1698.25" y="45.920000000000016" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-287" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PwdHash&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1935.88" y="-143.96" width="125" height="40" as="geometry" />
+          <mxGeometry x="-1864.13" y="-6.039999999999992" width="125" height="40" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-296" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="NZOLWawKIEO-KyV3UFa8-290" target="NZOLWawKIEO-KyV3UFa8-294" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-290" value="AES-GCM-256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1736.17" y="-83.96000000000001" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1664.42" y="25.920000000000016" width="137.39" height="40" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-294" value="&lt;b&gt;privKey_enc&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1557.92" y="-82.96000000000001" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-1486.17" y="26.920000000000016" width="86.17" height="39" as="geometry" />
         </mxCell>
         <mxCell id="NZOLWawKIEO-KyV3UFa8-300" value="&lt;b&gt;KeyEncryption&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2188.3199999999997" y="-187.96" width="110" height="30" as="geometry" />
+          <mxGeometry x="-2069.9999999999995" y="-36.03999999999999" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-284" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2199" y="46.03999999999999" width="780.36" height="233" as="geometry" />
+          <mxGeometry x="-2068.32" y="112.92" width="678.32" height="143.96" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-288" 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-289" target="XqTc7s29-gL46L3V4mSs-295" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-289" value="&lt;b&gt;part&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1940.5300000000004" y="225.04" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-2058.0000000000005" y="202.51" width="124.36" height="39" as="geometry" />
         </mxCell>
-        <mxCell id="XqTc7s29-gL46L3V4mSs-292" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="XqTc7s29-gL46L3V4mSs-293" target="XqTc7s29-gL46L3V4mSs-295" edge="1">
+        <mxCell id="XqTc7s29-gL46L3V4mSs-292" 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-293" target="XqTc7s29-gL46L3V4mSs-295" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1706.17" y="265.03999999999996" as="targetPoint" />
+            <mxPoint x="-1823.64" y="309.26" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1776.17" y="125.03999999999999" />
-              <mxPoint x="-1776.17" y="185.04" />
+              <mxPoint x="-1933.4700000000003" y="169.22" />
+              <mxPoint x="-1893.47" y="169.22" />
+              <mxPoint x="-1893.47" y="195.22" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-293" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PwdHash&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1941.1699999999998" y="102.03999999999999" width="125" height="40" as="geometry" />
+          <mxGeometry x="-2058.64" y="146.26" width="125" height="40" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-294" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="XqTc7s29-gL46L3V4mSs-295" target="XqTc7s29-gL46L3V4mSs-296" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-295" value="AES-GCM-256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1736.17" y="165.04" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1853.64" y="175.22" width="137.39" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="XqTc7s29-gL46L3V4mSs-296" value="&lt;b&gt;part_enc&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1557.92" y="166.04" width="124.36" height="39" as="geometry" />
+        <mxCell id="XqTc7s29-gL46L3V4mSs-296" value="&lt;b&gt;part_enc&lt;br&gt;&lt;/b&gt;512 bits (nonce + ciphertext)&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
+          <mxGeometry x="-1675.39" y="175.22" width="157.92" height="39" as="geometry" />
         </mxCell>
         <mxCell id="XqTc7s29-gL46L3V4mSs-300" value="&lt;b&gt;PartEncryption&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2188.3199999999997" y="56.03999999999999" width="110" height="30" as="geometry" />
+          <mxGeometry x="-2068.3199999999997" y="112.91999999999999" width="110" height="30" as="geometry" />
         </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">
           <mxGeometry relative="1" as="geometry">
@@ -562,53 +568,54 @@
           <mxGeometry x="-1320" y="517" width="60" height="33" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-296" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2199" y="-422.96" width="780.36" height="212.96" as="geometry" />
+          <mxGeometry x="-2069" y="-208.99999999999997" width="679" height="162.96" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-297" 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="U1iS4aTrDNJz4kT7s3QN-302" target="U1iS4aTrDNJz4kT7s3QN-301" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1935.0700000000002" y="-212.96" as="targetPoint" />
+            <mxPoint x="-1815.0700000000002" y="-29" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1969.87" y="-266.96000000000004" />
-              <mxPoint x="-1969.87" y="-302.96000000000004" />
+              <mxPoint x="-1898" y="-83.03999999999999" />
+              <mxPoint x="-1880" y="-83.03999999999999" />
+              <mxPoint x="-1880" y="-119.03999999999999" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="YeFEyNYQkg-0ZjFJJ9BC-284" value="salt" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="U1iS4aTrDNJz4kT7s3QN-297" vertex="1" connectable="0">
           <mxGeometry x="-0.3479" y="3" relative="1" as="geometry">
-            <mxPoint x="-11" y="2" as="offset" />
+            <mxPoint x="3" y="2" as="offset" />
           </mxGeometry>
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-298" 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="U1iS4aTrDNJz4kT7s3QN-299" target="U1iS4aTrDNJz4kT7s3QN-301" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1969.87" y="-342.96000000000004" />
-              <mxPoint x="-1969.87" y="-302.96000000000004" />
+              <mxPoint x="-1880" y="-159.04" />
+              <mxPoint x="-1880" y="-119.03999999999999" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-299" 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="-2179.67" y="-362.96000000000004" width="164.6" height="40" as="geometry" />
+          <mxGeometry x="-2059.67" y="-179.00000000000003" width="164.6" height="40" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-301" value="SCRYPT" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1939.58" y="-322.96000000000004" width="125" height="40" as="geometry" />
+          <mxGeometry x="-1859.58" y="-139.00000000000003" width="125" height="40" as="geometry" />
         </mxCell>
-        <mxCell id="U1iS4aTrDNJz4kT7s3QN-302" value="SeedRandom&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-2179.67" y="-286.96000000000004" width="161.76" height="44" as="geometry" />
+        <mxCell id="U1iS4aTrDNJz4kT7s3QN-302" value="SeedRandom&lt;br&gt;256 bits -&amp;gt;&amp;nbsp;base64" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
+          <mxGeometry x="-2059.67" y="-103.00000000000003" width="161.76" height="44" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-303" value="&lt;b&gt;PwdHash&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2193" y="-412.96000000000004" width="110" height="30" as="geometry" />
+          <mxGeometry x="-2070" y="-209.00000000000003" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-305" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fontColor=#333333;fillColor=#f5f5f5;strokeColor=#666666;" parent="1" vertex="1">
-          <mxGeometry x="-2199" y="313.03999999999996" width="28.93" height="28.93" as="geometry" />
+          <mxGeometry x="-2058.67" y="282.06999999999994" width="28.93" height="28.93" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-307" value="Relay - side chain node not required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2163.32" y="311.97" width="214.32" height="30" as="geometry" />
+          <mxGeometry x="-2022.9900000000002" y="281" width="214.32" height="30" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-310" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="-2200" y="348.0400000000001" width="28.93" height="28.93" as="geometry" />
+          <mxGeometry x="-2059.67" y="317.07000000000005" width="28.93" height="28.93" as="geometry" />
         </mxCell>
         <mxCell id="U1iS4aTrDNJz4kT7s3QN-311" value="Relay - side chain node required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2164.32" y="346.97000000000014" width="214.32" height="30" as="geometry" />
+          <mxGeometry x="-2023.9900000000002" y="316.0000000000001" width="214.32" height="30" as="geometry" />
         </mxCell>
         <mxCell id="KGCLxLdSfCaxDo2TsfCf-284" value="&lt;b&gt;`item_member_enc_by_sp_shared_secret`&lt;/b&gt;&lt;br&gt;(only for member managers)" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
           <mxGeometry x="-1320" y="423" width="260" height="29" as="geometry" />
@@ -746,45 +753,27 @@
             <mxPoint x="-930" y="730" as="targetPoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="KGCLxLdSfCaxDo2TsfCf-344" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;" parent="1" source="XqTc7s29-gL46L3V4mSs-304" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1320" y="440" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="-405" y="180" />
-              <mxPoint x="-380" y="180" />
-              <mxPoint x="-380" y="50" />
-              <mxPoint x="-60" y="50" />
-              <mxPoint x="-60" y="870" />
-              <mxPoint x="-1340" y="870" />
-              <mxPoint x="-1340" y="440" />
-              <mxPoint x="-1320" y="440" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="KGCLxLdSfCaxDo2TsfCf-345" value="SeedRand2&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privEncrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-450" y="112" width="137.39" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="YAJWOaMnfQJNXjO860FT-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.468;entryY=0.025;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="YAJWOaMnfQJNXjO860FT-287" target="YAJWOaMnfQJNXjO860FT-286" edge="1">
+        <mxCell id="YAJWOaMnfQJNXjO860FT-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="YAJWOaMnfQJNXjO860FT-287" target="YAJWOaMnfQJNXjO860FT-286" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="YAJWOaMnfQJNXjO860FT-285" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" target="YAJWOaMnfQJNXjO860FT-287" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1814.88" y="-302.96" as="sourcePoint" />
+            <mxPoint x="-1734.88" y="-118.99999999999997" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="YAJWOaMnfQJNXjO860FT-286" value="hash" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1774.5" y="-258.96000000000004" width="123.1" height="40" as="geometry" />
+          <mxGeometry x="-1490" y="-138.99999999999997" width="90" height="40" as="geometry" />
         </mxCell>
         <mxCell id="YAJWOaMnfQJNXjO860FT-287" value="SHA256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1785.88" y="-322.96" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1665.13" y="-138.99999999999997" width="137.39" height="40" as="geometry" />
         </mxCell>
         <mxCell id="mM1gybHHXk3-ZNENjHdL-284" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.224;entryY=0.065;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="8" target="181" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="xSIgGbmu95QqtSGV3vQQ-285" 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="xSIgGbmu95QqtSGV3vQQ-284" target="258">
+        <mxCell id="xSIgGbmu95QqtSGV3vQQ-285" 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="xSIgGbmu95QqtSGV3vQQ-284" target="258" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="xSIgGbmu95QqtSGV3vQQ-284" value="Password&lt;br&gt;18 characters" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
+        <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="35" width="115.75" height="32" as="geometry" />
         </mxCell>
       </root>
diff --git a/doc/diagrams/WalletCreate.png b/doc/diagrams/WalletCreate.png
index 794c90c..c97361a 100644
Binary files a/doc/diagrams/WalletCreate.png and b/doc/diagrams/WalletCreate.png differ
diff --git a/doc/diagrams/WalletRecover.drawio b/doc/diagrams/WalletRecover.drawio
index 82bf177..784df3c 100644
--- a/doc/diagrams/WalletRecover.drawio
+++ b/doc/diagrams/WalletRecover.drawio
@@ -1,11 +1,11 @@
-<mxfile host="Electron" modified="2024-03-08T15:04:14.662Z" 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="-QC2bOr7xgLHTAzFQqyY" version="23.1.5" type="device">
+<mxfile host="Electron" modified="2024-03-11T09:40:59.924Z" 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="cx7ZR7LvOlKMLCPzhIXO" version="23.1.5" type="device">
   <diagram name="Page-1" id="nezTab6434Mr3TNqJTht">
-    <mxGraphModel dx="3915" dy="2039" 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="4168" dy="2193" 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="sHT8GTnQFrlxJ-m2nGzn-6" value="WalletCreate" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-855.97" y="-328" width="88.81" height="33" as="geometry" />
+          <mxGeometry x="-855.97" y="-281" width="88.81" height="33" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-7" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-11" target="sHT8GTnQFrlxJ-m2nGzn-23" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -17,7 +17,7 @@
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-11" target="sHT8GTnQFrlxJ-m2nGzn-34" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1353.9" y="0.5000000000002274" as="targetPoint" />
+            <mxPoint x="-1353.9" y="47.50000000000023" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-10" value="OK" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="sHT8GTnQFrlxJ-m2nGzn-9" vertex="1" connectable="0">
@@ -26,7 +26,7 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-11" value="ImageRecover in cache ?" style="rhombus;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="-1244.5500000000002" y="-386" width="170" height="49" as="geometry" />
+          <mxGeometry x="-1244.5500000000002" y="-339" width="170" height="49" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-19" 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="sHT8GTnQFrlxJ-m2nGzn-23" target="sHT8GTnQFrlxJ-m2nGzn-6" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -39,10 +39,10 @@
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-23" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1071" y="-313" />
-              <mxPoint x="-1295" y="-313" />
+              <mxPoint x="-1071" y="-266" />
+              <mxPoint x="-1295" y="-266" />
             </Array>
-            <mxPoint x="-1294.98" y="-293" as="targetPoint" />
+            <mxPoint x="-1294.98" y="-246" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-22" value="OK" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="sHT8GTnQFrlxJ-m2nGzn-21" vertex="1" connectable="0">
@@ -51,58 +51,58 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-23" value="new device ?" style="rhombus;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="-1070.68" y="-336" width="170" height="49" as="geometry" />
+          <mxGeometry x="-1070.68" y="-289" width="170" height="49" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-25" target="sHT8GTnQFrlxJ-m2nGzn-11" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-25" value="" style="strokeWidth=2;html=1;shape=mxgraph.flowchart.start_2;whiteSpace=wrap;" parent="1" vertex="1">
-          <mxGeometry x="-1169.55" y="-424" width="20" height="20" as="geometry" />
+          <mxGeometry x="-1169.55" y="-377" width="20" height="20" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;labelBackgroundColor=none;fontColor=#000000;entryX=0.501;entryY=0.044;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-29" target="sHT8GTnQFrlxJ-m2nGzn-31" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1374.98" y="-200" as="sourcePoint" />
-            <mxPoint x="-1280" y="-247" as="targetPoint" />
+            <mxPoint x="-1374.98" y="-153" as="sourcePoint" />
+            <mxPoint x="-1280" y="-200" as="targetPoint" />
             <Array as="points" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-29" value="NewDevice" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1354.98" y="-290" width="120" height="33" as="geometry" />
+          <mxGeometry x="-1354.98" y="-243" width="120" height="33" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;labelBackgroundColor=none;fontColor=#000000;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-31" target="sHT8GTnQFrlxJ-m2nGzn-36" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1264.98" y="-189" as="sourcePoint" />
-            <mxPoint x="-1295.03" y="-171" as="targetPoint" />
+            <mxPoint x="-1264.98" y="-142" as="sourcePoint" />
+            <mxPoint x="-1295.03" y="-124" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-31" value="ImageRecoverUpload" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
-          <mxGeometry x="-1352.89" y="-242.21" width="115.48" height="29" as="geometry" />
+          <mxGeometry x="-1352.89" y="-195.21" width="115.48" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;labelBackgroundColor=none;fontColor=#000000;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-33" target="sHT8GTnQFrlxJ-m2nGzn-34" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1354.98" y="-109.21000000000001" as="sourcePoint" />
-            <mxPoint x="-1294.85" y="-86.99999999999997" as="targetPoint" />
+            <mxPoint x="-1354.98" y="-62.21000000000001" as="sourcePoint" />
+            <mxPoint x="-1294.85" y="-39.99999999999997" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-33" value="Cache" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="-1351.59" y="-155" width="114.62" height="29" as="geometry" />
+          <mxGeometry x="-1351.59" y="-108" width="114.62" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-306" 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="sHT8GTnQFrlxJ-m2nGzn-34" target="sHT8GTnQFrlxJ-m2nGzn-301" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1220" y="-90" />
-              <mxPoint x="-1220" y="-205" />
+              <mxPoint x="-1220" y="-43" />
+              <mxPoint x="-1220" y="-158" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-34" value="WalletRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1349.98" y="-107" width="114.44" height="33" as="geometry" />
+          <mxGeometry x="-1349.98" y="-60" width="114.44" height="33" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-35" 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="sHT8GTnQFrlxJ-m2nGzn-36" target="sHT8GTnQFrlxJ-m2nGzn-33" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-36" value="ImageRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1349.98" y="-198.07999999999998" width="110" height="29" as="geometry" />
+          <mxGeometry x="-1349.98" y="-151.07999999999998" width="110" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-37" 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="sHT8GTnQFrlxJ-m2nGzn-38" target="sHT8GTnQFrlxJ-m2nGzn-39" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -302,7 +302,7 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-297" value="Part1Enc" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1036.07" y="-115.5" width="60" height="30.71" as="geometry" />
+          <mxGeometry x="-1036.07" y="-68.5" width="60" height="30.71" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-336" 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="sHT8GTnQFrlxJ-m2nGzn-298" target="sHT8GTnQFrlxJ-m2nGzn-339" edge="1">
           <mxGeometry relative="1" as="geometry">
@@ -314,90 +314,82 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-298" value="SeedRand1&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-961.73" y="-115.5" width="81.73" height="29" as="geometry" />
-        </mxCell>
-        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-351" 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" target="sHT8GTnQFrlxJ-m2nGzn-341" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-717.0899999999997" y="-30" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="-717" y="40" />
-              <mxPoint x="-641" y="40" />
-            </Array>
-            <mxPoint x="-717.2532740213524" y="-82.78999999999974" as="sourcePoint" />
-          </mxGeometry>
+          <mxGeometry x="-961.73" y="-68.5" width="81.73" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-308" 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="sHT8GTnQFrlxJ-m2nGzn-300" target="sHT8GTnQFrlxJ-m2nGzn-297" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1007" y="-130" />
-              <mxPoint x="-1006" y="-130" />
+              <mxPoint x="-1007" y="-83" />
+              <mxPoint x="-1006" y="-83" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-309" 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="sHT8GTnQFrlxJ-m2nGzn-300" target="sHT8GTnQFrlxJ-m2nGzn-298" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1007" y="-130" />
-              <mxPoint x="-921" y="-130" />
+              <mxPoint x="-1007" y="-83" />
+              <mxPoint x="-921" y="-83" />
             </Array>
-            <mxPoint x="-930" y="-161" as="targetPoint" />
+            <mxPoint x="-930" y="-114" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-359" 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="sHT8GTnQFrlxJ-m2nGzn-325" target="5Ne0HzyGfQl-3uoNr5Rs-33" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-305.4199999999996" y="171.13999999999987" as="targetPoint" />
-            <mxPoint x="-340" y="171.6300000000001" as="sourcePoint" />
+            <mxPoint x="-396.4199999999996" y="171.13999999999987" as="targetPoint" />
+            <mxPoint x="-431" y="171.6300000000001" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="-423" y="150" />
-              <mxPoint x="-330" y="150" />
-              <mxPoint x="-330" y="57" />
+              <mxPoint x="-514" y="150" />
+              <mxPoint x="-430" y="150" />
+              <mxPoint x="-430" y="57" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-360" 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="sHT8GTnQFrlxJ-m2nGzn-325" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-423" y="150" />
-              <mxPoint x="-330" y="150" />
-              <mxPoint x="-330" y="133" />
+              <mxPoint x="-514" y="150" />
+              <mxPoint x="-430" y="150" />
+              <mxPoint x="-430" y="133" />
             </Array>
-            <mxPoint x="-305.4199999999996" y="133.43000000000006" as="targetPoint" />
-            <mxPoint x="-340" y="171.6300000000001" as="sourcePoint" />
+            <mxPoint x="-396.4199999999996" y="133.43000000000006" as="targetPoint" />
+            <mxPoint x="-431" y="171.6300000000001" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="Q8MjV8EZblA_sCvqo5JG-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-325" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-423" y="150" />
-              <mxPoint x="-330" y="150" />
-              <mxPoint x="-330" y="91" />
+              <mxPoint x="-514" y="150" />
+              <mxPoint x="-430" y="150" />
+              <mxPoint x="-430" y="91" />
             </Array>
-            <mxPoint x="-420" y="170" as="sourcePoint" />
-            <mxPoint x="-306" y="91" as="targetPoint" />
+            <mxPoint x="-511" y="170" as="sourcePoint" />
+            <mxPoint x="-397" y="91" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="I9sp5S672SgGMplcR-zX-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-300" target="I9sp5S672SgGMplcR-zX-5" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1007" y="-130" />
-              <mxPoint x="-834" y="-130" />
+              <mxPoint x="-1007" y="-83" />
+              <mxPoint x="-834" y="-83" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-300" value="ImageRecover" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1066.07" y="-175.87" width="118.1" height="29" as="geometry" />
+          <mxGeometry x="-1066.07" y="-128.87" width="118.1" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-312" 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="sHT8GTnQFrlxJ-m2nGzn-301" target="sHT8GTnQFrlxJ-m2nGzn-300" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-301" value="Cache" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1">
-          <mxGeometry x="-1066.8899999999999" y="-220" width="118.85" height="29" as="geometry" />
+          <mxGeometry x="-1066.8899999999999" y="-173" width="118.85" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-327" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-284" target="sHT8GTnQFrlxJ-m2nGzn-325" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-218.0564848910808" y="1001.5" as="sourcePoint" />
             <Array as="points">
-              <mxPoint x="-423" y="696" />
+              <mxPoint x="-430" y="696" />
+              <mxPoint x="-430" y="150" />
+              <mxPoint x="-514" y="150" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -421,38 +413,35 @@
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-317" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;SHA256&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
           <mxGeometry x="-1218.8500000000001" y="72.21" width="125" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-349" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-322" target="sHT8GTnQFrlxJ-m2nGzn-341" edge="1">
+        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-349" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-322" target="sHT8GTnQFrlxJ-m2nGzn-341" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-496.9999999999998" y="-18.62999999999974" as="sourcePoint" />
             <mxPoint x="-556.1442857142856" y="148.66" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-497" y="-100" />
-              <mxPoint x="-570" y="-100" />
-              <mxPoint x="-570" y="40" />
-              <mxPoint x="-641" y="40" />
+              <mxPoint x="-736" y="-37" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-322" value="Part2Enc" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-497.5299999999999" y="-115.50000000000001" width="103.81" height="29" as="geometry" />
+          <mxGeometry x="-779.4" y="-65.79000000000002" width="103.81" height="29" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-328" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-323" target="sHT8GTnQFrlxJ-m2nGzn-326" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-323" value="Shard" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-490.0295321963339" y="72.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
+          <mxGeometry x="-581.0295321963339" y="72.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-324" value="Shard" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-480.0295321963339" y="82.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
+          <mxGeometry x="-571.0295321963339" y="82.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-325" value="Shard" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-467.0295321963339" y="95.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
+          <mxGeometry x="-558.0295321963339" y="95.21" width="88.8134519572954" height="30.709999999999994" as="geometry" />
         </mxCell>
-        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-329" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-326" target="sHT8GTnQFrlxJ-m2nGzn-322" edge="1">
+        <mxCell id="sHT8GTnQFrlxJ-m2nGzn-329" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-326" target="sHT8GTnQFrlxJ-m2nGzn-322" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-326" value="Shamir Secret Sharing" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-541.0600000000001" y="13.070000000000007" width="190" height="30" as="geometry" />
+          <mxGeometry x="-632.0600000000001" y="13.070000000000007" width="190" height="30" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-331" value="" style="strokeWidth=2;html=1;shape=mxgraph.flowchart.start_2;whiteSpace=wrap;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
           <mxGeometry x="-965.5899999999999" y="775" width="20" height="20" as="geometry" />
@@ -483,33 +472,31 @@
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-352" 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="sHT8GTnQFrlxJ-m2nGzn-341" target="sHT8GTnQFrlxJ-m2nGzn-342" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-557.1149999999998" y="180" as="sourcePoint" />
-            <mxPoint x="-554.5150000000003" y="200" as="targetPoint" />
+            <mxPoint x="-652.1149999999998" y="180" as="sourcePoint" />
+            <mxPoint x="-649.5150000000003" y="200" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-341" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PartDecrypt&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-709.81" y="70.00000000000001" width="137.39" height="30" as="geometry" />
+          <mxGeometry x="-804.81" y="70.00000000000001" width="137.39" height="30" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-344" 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="sHT8GTnQFrlxJ-m2nGzn-342" target="sHT8GTnQFrlxJ-m2nGzn-343" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-638" y="160" />
+              <mxPoint x="-734" y="160" />
               <mxPoint x="-832" y="160" />
-              <mxPoint x="-832" y="169" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-342" value="Part2" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-697.4399999999999" y="120.00000000000003" width="117.85" height="30.71" as="geometry" />
+          <mxGeometry x="-792.4399999999999" y="120.00000000000003" width="117.85" height="30.71" as="geometry" />
         </mxCell>
         <mxCell id="sHT8GTnQFrlxJ-m2nGzn-364" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;strokeColor=#999999;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="sHT8GTnQFrlxJ-m2nGzn-343" target="sHT8GTnQFrlxJ-m2nGzn-313" edge="1">
           <mxGeometry relative="1" as="geometry">
             <mxPoint x="-790.7984697508899" y="170.5" as="sourcePoint" />
             <mxPoint x="-970" y="1050" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-771" y="194" />
-              <mxPoint x="-414" y="194" />
-              <mxPoint x="-414" y="1065" />
+              <mxPoint x="-580" y="193" />
+              <mxPoint x="-580" y="747" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -517,78 +504,78 @@
           <mxGeometry x="-876.0019217081851" y="179" width="88.8134519572954" height="28.999999999999993" as="geometry" />
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-1" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2067" y="97" width="563.23" height="230" as="geometry" />
+          <mxGeometry x="-2010" y="144" width="563.23" height="230" as="geometry" />
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-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" target="nZ-weh7uSchBR4PQQtC6-12" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1922.97" y="286.5" as="sourcePoint" />
+            <mxPoint x="-1865.97" y="333.5" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="nZ-weh7uSchBR4PQQtC6-10" target="nZ-weh7uSchBR4PQQtC6-12" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1812.97" y="307" as="targetPoint" />
+            <mxPoint x="-1755.97" y="354" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1882.97" y="167" />
-              <mxPoint x="-1882.97" y="227" />
+              <mxPoint x="-1825.97" y="214" />
+              <mxPoint x="-1825.97" y="274" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-10" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PwdHash&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-2042.6799999999998" y="147" width="125" height="40" as="geometry" />
+          <mxGeometry x="-1985.6799999999998" y="194" width="125" height="40" as="geometry" />
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="nZ-weh7uSchBR4PQQtC6-12" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1664.72" y="227.5" as="targetPoint" />
+            <mxPoint x="-1607.72" y="274.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-12" value="AES-GCM-256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1842.97" y="207" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1785.97" y="254" width="137.39" height="40" as="geometry" />
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-17" value="&lt;b&gt;KeyDecrypt&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2056.3199999999997" y="107" width="110" height="30" as="geometry" />
+          <mxGeometry x="-1999.3199999999997" y="154" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-18" value="&lt;b style=&quot;border-color: var(--border-color);&quot;&gt;privKey_enc&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-2041.6799999999998" y="267" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-1984.6799999999998" y="314" width="124.36" height="39" as="geometry" />
         </mxCell>
         <mxCell id="nZ-weh7uSchBR4PQQtC6-19" value="&lt;b&gt;privKey&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1664.2399999999998" y="207.5" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-1607.2399999999998" y="254.5" width="124.36" height="39" as="geometry" />
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-1" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2067" y="-164" width="563.23" height="240" as="geometry" />
+          <mxGeometry x="-2010" y="-117" width="563.23" height="240" as="geometry" />
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-3" 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="HDdD4gt86U7q7j0RBcuD-9" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1929.1" y="35.5" as="sourcePoint" />
+            <mxPoint x="-1872.1" y="82.5" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="HDdD4gt86U7q7j0RBcuD-7" target="HDdD4gt86U7q7j0RBcuD-9" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1819.1" y="56" as="targetPoint" />
+            <mxPoint x="-1762.1" y="103" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1889.1" y="-84" />
-              <mxPoint x="-1889.1" y="-24" />
+              <mxPoint x="-1832.1" y="-37" />
+              <mxPoint x="-1832.1" y="23" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-7" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;PwdHash&lt;/b&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-2048.81" y="-104" width="125" height="40" as="geometry" />
+          <mxGeometry x="-1991.81" y="-57" width="125" height="40" as="geometry" />
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="HDdD4gt86U7q7j0RBcuD-9" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1670.85" y="-23.5" as="targetPoint" />
+            <mxPoint x="-1613.85" y="23.5" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-9" value="AES-GCM-256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1849.1" y="-44" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1792.1" y="3" width="137.39" height="40" as="geometry" />
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-13" value="&lt;b&gt;PartDecrypt&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2056.3199999999997" y="-154" width="110" height="30" as="geometry" />
+          <mxGeometry x="-1999.3199999999997" y="-107" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-14" value="&lt;b&gt;part_enc&lt;/b&gt;&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-2043.81" y="16" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-1986.81" y="63" width="124.36" height="39" as="geometry" />
         </mxCell>
         <mxCell id="HDdD4gt86U7q7j0RBcuD-15" value="&lt;b&gt;part&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="-1670.37" y="-43.5" width="124.36" height="39" as="geometry" />
+          <mxGeometry x="-1613.37" y="3.5" width="124.36" height="39" as="geometry" />
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.003;entryY=0.621;entryDx=0;entryDy=0;fillColor=#dae8fc;strokeColor=#6c8ebf;entryPerimeter=0;" parent="1" target="Y_iTnzTvrgFW2w7x7B82-6" edge="1">
           <mxGeometry relative="1" as="geometry">
@@ -650,14 +637,14 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-13" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="-2067" y="-424" width="563.23" height="240" as="geometry" />
+          <mxGeometry x="-2010" y="-377" width="563.23" height="240" as="geometry" />
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-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="Y_iTnzTvrgFW2w7x7B82-22" target="Y_iTnzTvrgFW2w7x7B82-19" edge="1">
           <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-1803.07" y="-214" as="targetPoint" />
+            <mxPoint x="-1746.07" y="-167" as="targetPoint" />
             <Array as="points">
-              <mxPoint x="-1837.87" y="-268" />
-              <mxPoint x="-1837.87" y="-304" />
+              <mxPoint x="-1780.87" y="-221" />
+              <mxPoint x="-1780.87" y="-257" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -669,13 +656,13 @@
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-16" 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="Y_iTnzTvrgFW2w7x7B82-17" target="Y_iTnzTvrgFW2w7x7B82-19" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="-1837.87" y="-344" />
-              <mxPoint x="-1837.87" y="-304" />
+              <mxPoint x="-1780.87" y="-297" />
+              <mxPoint x="-1780.87" y="-257" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-17" 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="-2047.67" y="-364" width="164.6" height="40" as="geometry" />
+          <mxGeometry x="-1990.67" y="-317" width="164.6" height="40" as="geometry" />
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-27" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.468;entryY=0.025;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="_sUySUgutdZOfC_v2Y1--1" target="Y_iTnzTvrgFW2w7x7B82-26" edge="1">
           <mxGeometry relative="1" as="geometry" />
@@ -684,16 +671,16 @@
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-19" value="SCRYPT" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1807.58" y="-324" width="125" height="40" as="geometry" />
+          <mxGeometry x="-1750.58" y="-277" width="125" height="40" as="geometry" />
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-22" value="SeedRandom&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-2047.67" y="-288" width="161.76" height="44" as="geometry" />
+          <mxGeometry x="-1990.67" y="-241" width="161.76" height="44" as="geometry" />
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-23" value="&lt;b&gt;PwdHash&lt;/b&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2061" y="-414" width="110" height="30" as="geometry" />
+          <mxGeometry x="-2004" y="-367" width="110" height="30" as="geometry" />
         </mxCell>
         <mxCell id="Y_iTnzTvrgFW2w7x7B82-26" value="hash" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-1642.62" y="-260" width="123.1" height="40" as="geometry" />
+          <mxGeometry x="-1585.62" y="-213" width="123.1" height="40" as="geometry" />
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-1" value="&lt;b&gt;`pre_id_sp_enc_by_shared_secret`&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color);&quot;&gt;(only for member managers)&lt;b&gt;&lt;br&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;" parent="1" vertex="1">
           <mxGeometry x="-1246.24" y="188.71" width="236.19" height="29" as="geometry" />
@@ -789,61 +776,48 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-31" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyMainSpend&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privDecrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-306" y="85.19" width="149.75" height="30" as="geometry" />
+          <mxGeometry x="-397" y="85.19" width="149.75" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-32" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyMainScan&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privDecrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-305.14999999999986" y="123.38999999999999" width="148.9" height="30" as="geometry" />
+          <mxGeometry x="-396.14999999999986" y="123.38999999999999" width="148.9" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-33" value="&lt;b style=&quot;border-color: var(--border-color); text-align: center;&quot;&gt;KeyRecoverScan&lt;/b&gt;&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privDecrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-305.9999999999999" y="42" width="149.75" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="5Ne0HzyGfQl-3uoNr5Rs-35" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="-717.2532740213524" y="-111.78999999999974" as="targetPoint" />
-            <Array as="points">
-              <mxPoint x="-140" y="173" />
-              <mxPoint x="-140" y="-132" />
-              <mxPoint x="-717" y="-132" />
-            </Array>
-          </mxGeometry>
+          <mxGeometry x="-396.9999999999999" y="42" width="149.75" height="30" as="geometry" />
         </mxCell>
         <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-35" value="PCD item_name=member&lt;br&gt;-&amp;gt; ItemMember (sp addess of the user)" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fontColor=#000000;fontStyle=1" parent="1" vertex="1">
-          <mxGeometry x="-550" y="158" width="250" height="30.71" as="geometry" />
-        </mxCell>
-        <mxCell id="5Ne0HzyGfQl-3uoNr5Rs-37" value="SeedRand2&lt;br style=&quot;border-color: var(--border-color); font-weight: 400; text-align: center;&quot;&gt;&lt;span style=&quot;font-weight: normal;&quot;&gt;privDecrypt&lt;/span&gt;" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-790.9999999999999" y="-112.79" width="149.75" height="30" as="geometry" />
+          <mxGeometry x="-558.03" y="177" width="250" height="30.71" as="geometry" />
         </mxCell>
         <mxCell id="_sUySUgutdZOfC_v2Y1--1" value="SHA256" style="label;whiteSpace=wrap;html=1;image=img/clipart/Gear_128x128.png" parent="1" vertex="1">
-          <mxGeometry x="-1654" y="-324" width="137.39" height="40" as="geometry" />
+          <mxGeometry x="-1597" y="-277" width="137.39" height="40" as="geometry" />
         </mxCell>
         <mxCell id="I9sp5S672SgGMplcR-zX-1" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fontColor=#333333;fillColor=#f5f5f5;strokeColor=#666666;" parent="1" vertex="1">
-          <mxGeometry x="-2066" y="338.06999999999994" width="28.93" height="28.93" as="geometry" />
+          <mxGeometry x="-2009" y="385.06999999999994" width="28.93" height="28.93" as="geometry" />
         </mxCell>
         <mxCell id="I9sp5S672SgGMplcR-zX-2" value="Relay - side chain node not required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2030.3200000000002" y="337" width="214.32" height="30" as="geometry" />
+          <mxGeometry x="-1973.3200000000002" y="384" width="214.32" height="30" as="geometry" />
         </mxCell>
         <mxCell id="I9sp5S672SgGMplcR-zX-3" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;container=0;rounded=1;labelBackgroundColor=none;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-          <mxGeometry x="-2067" y="373.07000000000005" width="28.93" height="28.93" as="geometry" />
+          <mxGeometry x="-2010" y="420.07000000000005" width="28.93" height="28.93" as="geometry" />
         </mxCell>
         <mxCell id="I9sp5S672SgGMplcR-zX-4" value="Relay - side chain node required" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="-2031.3200000000002" y="372.0000000000001" width="214.32" height="30" as="geometry" />
+          <mxGeometry x="-1974.3200000000002" y="419.0000000000001" width="214.32" height="30" as="geometry" />
         </mxCell>
-        <mxCell id="I9sp5S672SgGMplcR-zX-6" 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="I9sp5S672SgGMplcR-zX-5" target="sHT8GTnQFrlxJ-m2nGzn-339" edge="1">
+        <mxCell id="I9sp5S672SgGMplcR-zX-6" 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="I9sp5S672SgGMplcR-zX-5" target="sHT8GTnQFrlxJ-m2nGzn-341" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="-834" y="40" />
-              <mxPoint x="-990" y="40" />
+              <mxPoint x="-736" y="40" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="I9sp5S672SgGMplcR-zX-5" value="SeedRand2&lt;br&gt;256 bits" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1">
-          <mxGeometry x="-868.58" y="-113.79" width="70" height="29" as="geometry" />
+          <mxGeometry x="-868.58" y="-66.79" width="70" height="29" as="geometry" />
         </mxCell>
-        <mxCell id="VY5BnqjUr2LHQryPuXbw-2" 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="VY5BnqjUr2LHQryPuXbw-1" target="sHT8GTnQFrlxJ-m2nGzn-317">
+        <mxCell id="VY5BnqjUr2LHQryPuXbw-2" 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="VY5BnqjUr2LHQryPuXbw-1" target="sHT8GTnQFrlxJ-m2nGzn-317" edge="1">
           <mxGeometry relative="1" as="geometry" />
         </mxCell>
-        <mxCell id="VY5BnqjUr2LHQryPuXbw-1" value="Password" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" vertex="1" parent="1">
-          <mxGeometry x="-1200.76" y="-112.79" width="88.81" height="33" as="geometry" />
+        <mxCell id="VY5BnqjUr2LHQryPuXbw-1" value="Password" style="rounded=1;whiteSpace=wrap;html=1;labelBackgroundColor=none;fillColor=#dae8fc;strokeColor=#6c8ebf;fontStyle=1" parent="1" vertex="1">
+          <mxGeometry x="-1200.76" y="-65.79" width="88.81" height="33" as="geometry" />
         </mxCell>
       </root>
     </mxGraphModel>
diff --git a/doc/diagrams/WalletRecover.png b/doc/diagrams/WalletRecover.png
index 2b5e776..ed94bd3 100644
Binary files a/doc/diagrams/WalletRecover.png and b/doc/diagrams/WalletRecover.png differ