diff --git a/src/qanGraph.h b/src/qanGraph.h
index e4c90981..3e97c6f9 100644
--- a/src/qanGraph.h
+++ b/src/qanGraph.h
@@ -343,14 +343,14 @@ class Graph : public gtpo::graph<QQuickItem, qan::Node, qan::Group, qan::Edge>
      * \note trigger nodeInserted() signal after insertion and generate a call to onNodeInserted().
      */
     template <class Node_t>
-    qan::Node*              insertNode(QQmlComponent* nodeComponent = nullptr, qan::NodeStyle* nodeStyle = nullptr);
+    Node_t*                 insertNode(QQmlComponent* nodeComponent = nullptr, qan::NodeStyle* nodeStyle = nullptr);
 
     /*! \brief Same semantic than insertNode<>() but for non visual nodes.
      *
      * \note trigger nodeInserted() signal after insertion and generate a call to onNodeInserted().
      */
     template <class Node_t>
-    qan::Node*              insertNonVisualNode();
+    Node_t*                 insertNonVisualNode();
 
     /*! \brief Insert and existing node with a specific delegate component and a custom style.
      *
diff --git a/src/qanGraph.hpp b/src/qanGraph.hpp
index c6e2ac37..e2dd4fd1 100644
--- a/src/qanGraph.hpp
+++ b/src/qanGraph.hpp
@@ -37,7 +37,7 @@ namespace qan { // ::qan
 
 /* Graph Factories *///--------------------------------------------------------
 template <class Node_t>
-qan::Node*  Graph::insertNode(QQmlComponent* nodeComponent, qan::NodeStyle* nodeStyle)
+Node_t*  Graph::insertNode(QQmlComponent* nodeComponent, qan::NodeStyle* nodeStyle)
 {
     if (nodeComponent == nullptr) {
         const auto engine = qmlEngine(this);
@@ -108,7 +108,7 @@ qan::Node*  Graph::insertNode(QQmlComponent* nodeComponent, qan::NodeStyle* node
 }
 
 template <class Node_t>
-qan::Node*  Graph::insertNonVisualNode()
+Node_t*  Graph::insertNonVisualNode()
 {
     const auto node = new Node_t();
     try {
@@ -217,4 +217,3 @@ qan::Group* Graph::insertTable(int cols, int rows)
 //-----------------------------------------------------------------------------
 
 } // ::qan
-