diff --git a/doc/uml/core-classes.png b/doc/uml/core-classes.png
index e4301ce094b5e534b468d8731cb8e30665b23bf1..000636eb518c8e441bb799c053286adc6ede60d0 100644
Binary files a/doc/uml/core-classes.png and b/doc/uml/core-classes.png differ
diff --git a/doc/uml/core-classes.pu b/doc/uml/core-classes.pu
index 65254f1fb470bc58622d323e598005600ed761e1..fc8d1e6d972241369d76c3d582a79dc3d6f28762 100644
--- a/doc/uml/core-classes.pu
+++ b/doc/uml/core-classes.pu
@@ -57,9 +57,19 @@ package core {
 	-- Properties --
 	network
 	-- Methods --
+
 	}
-	Community "1" --* "1" Network
+	App --> Identity
+	class Identity {
+		{static} _identities
+		{static} load(data : dict)
+		{static} lookup(search : str)
+	}
+
+}
+
 
+package net {
 	class Network {
 	-- Signals --
 	node_found(int : index)
@@ -71,6 +81,7 @@ package core {
 	root_nodes
 	-- Methods --
 	}
+	Community "1" --* "1" Network
 	Network "1" --* "*" Node
 
 	class Node {
@@ -86,15 +97,5 @@ package core {
 	-- Methods --
 	}
 
-	App --> Identity
-	class Identity {
-		{static} _identities
-		{static} load(data : dict)
-		{static} lookup(search : str)
-	}
-
 }
-
-
-
 @enduml
\ No newline at end of file
diff --git a/doc/uml/cutecoin.png b/doc/uml/cutecoin.png
index c577740021f71e58b15acba1783e3f1a130f7300..59780e445fce620ad5f355c3d3f8ae1a95c92025 100644
Binary files a/doc/uml/cutecoin.png and b/doc/uml/cutecoin.png differ
diff --git a/doc/uml/cutecoin.pu b/doc/uml/cutecoin.pu
index cc46016ba98186353329538078d1c9eee2a6d5e0..d79f67dfb4614935631fd76663cdd922aac6b841 100644
--- a/doc/uml/cutecoin.pu
+++ b/doc/uml/cutecoin.pu
@@ -3,6 +3,7 @@
 !include core-classes.pu
 !include gui-classes.pu
 !include models-classes.pu
+!include api.pu
 
 MainWindow "1" --> "1" App
 
@@ -24,4 +25,12 @@ ConfigureCommunityDialog --> RootNodesTableModel
 
 ConfigureAccountDialog --> Account
 ConfigureCommunityDialog --> Community
+
+Account ..> BMADataAccess
+Community ..> BMADataAccess
+Wallet ..> BMADataAccess
+Transfer ..> BMADataAccess
+Identity ..> BMADataAccess
+BMADataAccess .left.> Network
+
 @enduml
\ No newline at end of file
diff --git a/doc/uml/gui-classes.png b/doc/uml/gui-classes.png
index d33b836471f6bb338ff32303181628bbf76dfe4b..7df50d51d4ae74fb4f99c2b47eac4b31cc633b15 100644
Binary files a/doc/uml/gui-classes.png and b/doc/uml/gui-classes.png differ
diff --git a/doc/uml/gui-classes.pu b/doc/uml/gui-classes.pu
index 26b7c9a35ce2cff3299ffdc112eb5a9740a2bdf9..f8a0bc964fc2dd6a5714d56dab6da971bdd5e2cd 100644
--- a/doc/uml/gui-classes.pu
+++ b/doc/uml/gui-classes.pu
@@ -38,11 +38,13 @@ package gui {
 
 		class WotTab {
 		}
+		package dialogs {
 		class CertificationDialog
 		class TransferDialog
 		class ContactDialog
 		class ConfigureAccountDialog
 		class ConfigureCommunityDialog
+		}
 
 	MainWindow --> CertificationDialog
 	MainWindow --> TransferDialog
diff --git a/setup.py b/setup.py
index 347935fa0aeded4b3c1fb37d474814a3d977968c..5e32c24b9ce45c26b8fb5c0eaa730b878bdb97bf 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,6 @@ includefiles = []
 if sys.platform == "win32":
     app = QtCore.QCoreApplication(sys.argv)
     pyqt_path = QtCore.QCoreApplication.libraryPaths()[0]
-    print(pyqt_path)
     libEGL_path = os.path.join(os.path.dirname(pyqt_path), "libEGL.dll")
     includefiles.append(libEGL_path)
     includefiles.append("platforms/win32/libsodium.dll")
diff --git a/src/cutecoin/core/app.py b/src/cutecoin/core/app.py
index a7558b824db7e8866ddb78d967b1a7a08ca9fd0b..848ca56d722762ccb879268822df1f3a7f14cdb1 100644
--- a/src/cutecoin/core/app.py
+++ b/src/cutecoin/core/app.py
@@ -418,6 +418,6 @@ class Application(QObject):
             version = (__version__ == latest_version,
                        latest_version,
                        latest["html_url"])
+            self.available_version = version
         logging.debug("Current version : {0}".format(__version__))
-        self.available_version = version
         self.version_requested.emit()
diff --git a/src/cutecoin/core/net/discover/network.py b/src/cutecoin/core/net/discover/network.py
index 02aac76304b415f5ce550f6eb43ecc16b748f258..3edf19945ee1667ae466496b655d02aa3ef7ef6e 100644
--- a/src/cutecoin/core/net/discover/network.py
+++ b/src/cutecoin/core/net/discover/network.py
@@ -199,7 +199,7 @@ class Network(QObject):
         logging.debug("New node found : {0}".format(peer.pubkey[:5]))
         pubkeys = [n.pubkey for n in self.nodes]
         if peer.pubkey not in pubkeys:
-            node = Node.from_peer(self._currency, peer)
+            node = Node.from_peer(self.network_manager, self.currency, peer)
             self.add_node(node)
             self.nodes_changed.emit()