-./application/hub/main/nodes/class_BaseHubNode.php:445: * @todo Try to make this method more generic so we can move it in BaseFrameworkSystem
-./application/hub/main/nodes/class_BaseHubNode.php:485: * @todo Change the first if() block to check for a specific state
-./application/hub/main/nodes/class_BaseHubNode.php:658: // @TODO Add some criteria, e.g. if the node is active or so
-./application/hub/main/nodes/class_BaseHubNode.php:716: * @todo Add checking if this node has been announced to the sender node
-./application/hub/main/nodes/class_BaseHubNode.php:758: * @todo Find more to do here
-./application/hub/main/nodes/class_BaseHubNode.php:770: * @todo Handle thrown exception
+./application/hub/main/nodes/class_BaseHubNode.php:109: * @todo Make this code more generic and move it to CryptoHelper or
+./application/hub/main/nodes/class_BaseHubNode.php:458: * @todo Try to make this method more generic so we can move it in BaseFrameworkSystem
+./application/hub/main/nodes/class_BaseHubNode.php:498: * @todo Change the first if() block to check for a specific state
+./application/hub/main/nodes/class_BaseHubNode.php:671: // @TODO Add some criteria, e.g. if the node is active or so
+./application/hub/main/nodes/class_BaseHubNode.php:729: * @todo Add checking if this node has been announced to the sender node
+./application/hub/main/nodes/class_BaseHubNode.php:749: * @todo Add checking if this node has been announced to the sender node
+./application/hub/main/nodes/class_BaseHubNode.php:813: * @todo Find more to do here
+./application/hub/main/nodes/class_BaseHubNode.php:826: * @todo Handle thrown exception