diff --git a/README.md b/README.md
index 3ded85c..3a174ee 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ from ...plugin.....other_product import OtherProduct
 @product(
     module=SomeModule,              # Declares the module or plugin this component belongs to
     imports=[SomeService, ...],     # List of dependencies (components) that this product needs
-    provider=providers.Singleton,   # Provider type (Singleton, Factory, Resource)
+    provider=providers.Factory,   # Provider type (Singleton, Factory, Resource)
 )
 class SomeProduct(Interface, Product):
     """This is the product class. This class will check for its dependencies.
@@ -216,32 +216,28 @@ class SomeProduct(Interface, Product):
 
 ## Important Notes
 
-- Declare all the dependencies (components) on Instances and Products to avoid injection issues.
+- Remember to declare all the dependencies you need in the `imports` parameter of the `@instance` or `@product` decorator.
 - Read the documentation carefully and refer to the examples to understand the framework's behavior.
 
 ## Usage Examples
 
 This repository includes a practical example demonstrating how to use the framework. You can find this example in the `example` directory. It showcases the implementation of the core components and how they interact to manage dependencies effectively in a sample application.
 
-This example requires the `module-injection` package to be installed and the `library` folder to be present in the project root.
-
 ## Future Work
 
 This project is a work in progress, and there are several improvements and enhancements planned for the future.
 
 Some planned features are:
+- Add pre-defined components for common patterns and use cases
+- Dependency CLI support for easier interaction with the framework
+- Pytest testing framework integration for better test management
+
+Some new improvements that has been recently added:
 - Enhance documentation and examples for better understanding
 - Implement framework API and extension points for customization
 - Improve injection resolution and initialization process
-- Testing framework integration for better test coverage
 - Visualization tools for dependency graphs and relationships
 
-Some of the areas that will be explored in the future include:
-- Add some basic components and plugins for common use cases
-- Dependency CLI support for easier interaction with the framework
-- Explore more advanced dependency injection patterns and use cases
-- Improve testing and validation for projects using this framework
-
 Pending issues that eventually will be addressed:
 - Migration guide from previous versions (some breaking changes were introduced)
 
diff --git a/pyproject.toml b/pyproject.toml
index 4ddcb4e..31b10d2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,6 +22,7 @@ dependencies = [
   "pytest-asyncio",
   "pytest-cov",
   "pytest-xdist",
+  "uvloop",
 ]
 
 [tool.hatch.envs.build.env-vars]
@@ -68,13 +69,12 @@ testpaths = ["tests"]
 
 [project]
 name = "module_dependency"
-version = "1.1.5"
+version = "1.1.6"
 dependencies = [
   "dependency_injector",
   "jinja2",
   "pydantic",
   "pydantic-settings",
-  "uvloop",
 ]
 requires-python = ">=3.11"
 authors = [
diff --git a/src/dependency/library/graph/generate.py b/src/dependency/library/graph/generate.py
index 6469501..f887f1e 100644
--- a/src/dependency/library/graph/generate.py
+++ b/src/dependency/library/graph/generate.py
@@ -1,6 +1,6 @@
 from dependency.core import Registry
-from dependency.library.graph.models import Graph
-from dependency.library.graph.process import process_container
+from dependency.core.injection import ContainerInjection, ProviderInjection
+from dependency.library.graph.models import Graph, Cluster, Node, Edge
 
 def generate_graph(
     output: str = "build/output",
@@ -8,16 +8,49 @@ def generate_graph(
 ) -> None:
     """Generate a graph visualization of the registered containers and providers.
 
-    This method is intended for debugging and documentation purposes, allowing
-    developers to visualize the structure of their dependency graph. It uses
-    the graphviz library to create a visual representation of the nodes and
-    their relationships.
-    """
+    This method allows you to visualize the structure of your dependency graph, including the
+    containers (modules) and providers (components/products) and their relationships. The generated
+    graph can be used for debugging, documentation, or simply to understand the structure of your
+    dependency graph. The output will be saved as an SVG file at the specified location.
 
+    Args:
+        output: The output path for the generated graph.
+        ignore_modules: A set of module names to ignore during graph generation.
+    """
     graph: Graph = Graph(name="Dependency Graph")
     for container in Registry.containers:
         if container.is_root:
-            process_container(graph, container, ignore_modules)
+            graph.drawable.append(process_container(graph, container, ignore_modules))
 
     digraph = graph.draw()
     digraph.render(filename=output, format="svg") # type: ignore
+
+def process_container(
+    graph: Graph,
+    container: ContainerInjection,
+    ignore_modules: set[str] = {"BasePlugin"},
+) -> Cluster:
+    cluster = Cluster(name=container.name)
+    for child in container.childs:
+        if isinstance(child, ContainerInjection):
+            cluster.childs.append(process_container(graph, child, ignore_modules))
+        elif isinstance(child, ProviderInjection):
+            cluster.childs.append(process_provider(graph, child, ignore_modules))
+    return cluster
+
+def process_provider(
+    graph: Graph,
+    provider: ProviderInjection,
+    ignore_modules: set[str] = {"BasePlugin"},
+) -> Node:
+    if provider.parent is not None and str(provider.parent) in ignore_modules:
+        return Node(name=provider.name)
+
+    for dependent in provider.injectable.dependent:
+        source: str = provider.injectable.interface_cls.__name__
+        target: str = dependent.interface_cls.__name__
+        edge: Edge = Edge(source=source, target=target)
+        graph.edges.append(edge)
+
+    in_degree: int = provider.injectable.weight()
+    return Node(name=provider.name, in_degree=in_degree)
diff --git a/src/dependency/library/graph/models.py b/src/dependency/library/graph/models.py
index dbccab3..4c3afc5 100644
--- a/src/dependency/library/graph/models.py
+++ b/src/dependency/library/graph/models.py
@@ -1,12 +1,13 @@
 from abc import ABC, abstractmethod
-from itertools import pairwise
+from itertools import groupby, pairwise
 from graphviz import Digraph
 from pydantic import BaseModel
-from typing import Optional
+
+GROUP_SIZE: int = 2
 
 class Graph(BaseModel):
     name: str = "Dependency Graph"
-    drawable: dict[str, Drawable] = {}
+    drawable: list[Drawable] = []
     edges: list[Edge] = []
 
     def draw(self) -> Digraph:
@@ -14,7 +15,7 @@ def draw(self) -> Digraph:
         graph.attr(rankdir="TB", newrank="true", ordering="in", overlap="false", splines="true", nodesep="1.0", ranksep="1.0")
         graph.attr("node", fontname="Helvetica", fontsize="12", margin="0.2", style="invis")
 
-        for drawable in self.drawable.values():
+        for drawable in self.drawable:
             drawable.draw(graph)
         for edge in self.edges:
             edge.draw(graph)
@@ -22,7 +23,6 @@ def draw(self) -> Digraph:
 
 class Drawable(BaseModel, ABC):
     name: str
-    label: Optional[str] = None
     in_degree: int = 0
 
     @abstractmethod
@@ -31,7 +31,6 @@ def draw(self, parent: Digraph) -> None:
 
 class Cluster(Drawable):
     childs: list[Drawable] = []
-    include_modules: bool = True
     style: dict[str, str] = {
         "style": "rounded,filled",
         "fillcolor": "lightyellow",
@@ -40,17 +39,26 @@ class Cluster(Drawable):
     }
 
     def draw(self, parent: Digraph) -> None:
-        name: str = f"cluster_{self.name}" if self.include_modules else self.name
-        with parent.subgraph(name=name) as c:
+        with parent.subgraph(name=f"cluster_{self.name}") as c:
             c.attr(label=self.name, **self.style)
 
+            # Agrupar por profundidad y ordenar por in_degree dentro de cada grupo
+            def bucket(x: Drawable): return x.in_degree // GROUP_SIZE
             childs: list[Drawable] = sorted(self.childs, key=lambda c: c.in_degree)
-            for child in childs:
-                child.draw(c)
+            groups = [list(g) for _, g in groupby(childs, key=bucket)]
+
+            for group in groups:
+                for child in group:
+                    child.draw(c)
+
+                # Arista invisible entre nodos del mismo grupo para mantenerlos juntos
+                for i, (n1, n2) in enumerate(pairwise(group)):
+                    if isinstance(n2, Node) and i % min(2,  max(1, len(group) // GROUP_SIZE)) != 0:
+                        c.edge(n1.name, n2.name, style="invis", weight="1")
 
-            # Encadenar nodos verticalmente con aristas invisibles
-            for i, j in pairwise(childs):
-                c.edge(i.name, j.name, style="invis", weight="10")
+            # Arista invisible solo entre representantes de grupos consecutivos
+            for (g1, g2) in pairwise(groups):
+                c.edge(g1[0].name, g2[0].name, style="invis", weight="1")
 
 class Node(Drawable):
     style: dict[str, str] = {
@@ -60,15 +68,12 @@ class Node(Drawable):
     }
 
     def draw(self, parent: Digraph) -> None:
-        parent.node(self.name, label=self.label, **self.style)
+        parent.node(self.name, **self.style)
 
 class Edge(BaseModel):
     source: str
     target: str
-    same_cluster: bool = False
 
     def draw(self, parent: Digraph) -> None:
         kwargs: dict[str, str] = {}
-        if self.same_cluster:
-            kwargs["constraint"] = "false"
-        parent.edge(self.source, self.target, **kwargs)
+        parent.edge(self.source, self.target, weight="5", minlen="1", **kwargs)
diff --git a/src/dependency/library/graph/process.py b/src/dependency/library/graph/process.py
deleted file mode 100644
index 7501c63..0000000
--- a/src/dependency/library/graph/process.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from dependency.core.injection import ContainerInjection, ProviderInjection
-from dependency.library.graph.models import Graph, Drawable, Cluster, Node, Edge
-
-def process_container(
-    graph: Graph,
-    container: ContainerInjection,
-    ignore_modules: set[str] = {"BasePlugin"},
-) -> Cluster:
-    cluster = Cluster(name=container.name)
-    for child in container.childs:
-        if isinstance(child, ContainerInjection):
-            cluster.childs.append(process_container(graph, child, ignore_modules))
-        elif isinstance(child, ProviderInjection):
-            cluster.childs.append(process_provider(graph, child, ignore_modules))
-    graph.drawable[container.name] = cluster
-    return cluster
-
-def process_provider(
-    graph: Graph,
-    provider: ProviderInjection,
-    ignore_modules: set[str] = {"BasePlugin"},
-) -> Node:
-    if provider.parent is not None and str(provider.parent) in ignore_modules:
-        return Node(name=provider.name)
-
-    for dependent in provider.injectable.dependent:
-        source: str = provider.injectable.interface_cls.__name__
-        target: str = dependent.interface_cls.__name__
-        edge: Edge = Edge(source=source, target=target)
-        graph.edges.append(edge)
-
-    in_degree: int = provider.injectable.weight()
-    return Node(name=provider.name, in_degree=in_degree)
diff --git a/src/dependency/library/graph/utils.py b/src/dependency/library/graph/utils.py
deleted file mode 100644
index 457c50d..0000000
--- a/src/dependency/library/graph/utils.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from dependency.core.injection import Injectable, ProviderInjection
-
-def find_first_parent(
-    provider: ProviderInjection,
-    visited: set[ProviderInjection] | None = None,
-    injectable_to_provider: dict[Injectable, ProviderInjection] = {},
-) -> str:
-    if visited is None:
-        visited = set()
-    if provider in visited:
-        return "fallback"
-    visited.add(provider)
-
-    if provider.parent is not None:
-        if provider.parent.name not in ("RootInternal", "FallbackInternal"):
-            return provider.parent.name
-
-    scores: dict[str, int] = {}
-    for dependent in provider.injectable.dependent:
-        dep_provider = injectable_to_provider.get(dependent)
-        if dep_provider is None:
-            continue
-        result = find_first_parent(dep_provider, visited, injectable_to_provider)
-        if result != "fallback":
-            scores[result] = scores.get(result, 0) + 1
-
-    if scores:
-        return max(scores, key=lambda k: scores[k])
-    return "fallback"
diff --git a/src/example/diagram.svg b/src/example/diagram.svg
index 531e49d..6188d08 100644
--- a/src/example/diagram.svg
+++ b/src/example/diagram.svg
@@ -1,149 +1,143 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 14.1.3 (0)
+<!-- Generated by graphviz version 14.1.4 (0)
  -->
 <!-- Pages: 1 -->
-<svg width="906pt" height="569pt"
- viewBox="0.00 0.00 906.00 569.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 564.5)">
-<polygon fill="white" stroke="none" points="-4,4 -4,-564.5 902,-564.5 902,4 -4,4"/>
+<svg width="1087pt" height="453pt"
+ viewBox="0.00 0.00 1087.00 453.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 449.45)">
+<polygon fill="white" stroke="none" points="-4,4 -4,-449.45 1083,-449.45 1083,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_BasePlugin</title>
-<path fill="lightyellow" stroke="gray" stroke-width="2" d="M20,-238.1C20,-238.1 138,-238.1 138,-238.1 144,-238.1 150,-244.1 150,-250.1 150,-250.1 150,-540.5 150,-540.5 150,-546.5 144,-552.5 138,-552.5 138,-552.5 20,-552.5 20,-552.5 14,-552.5 8,-546.5 8,-540.5 8,-540.5 8,-250.1 8,-250.1 8,-244.1 14,-238.1 20,-238.1"/>
-<text xml:space="preserve" text-anchor="middle" x="79" y="-535.2" font-family="Times,serif" font-size="14.00">BasePlugin</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_ReporterPlugin</title>
-<path fill="lightyellow" stroke="gray" stroke-width="2" d="M218,-123.05C218,-123.05 394,-123.05 394,-123.05 400,-123.05 406,-129.05 406,-135.05 406,-135.05 406,-425.45 406,-425.45 406,-431.45 400,-437.45 394,-437.45 394,-437.45 218,-437.45 218,-437.45 212,-437.45 206,-431.45 206,-425.45 206,-425.45 206,-135.05 206,-135.05 206,-129.05 212,-123.05 218,-123.05"/>
-<text xml:space="preserve" text-anchor="middle" x="306" y="-420.15" font-family="Times,serif" font-size="14.00">ReporterPlugin</text>
+<path fill="lightyellow" stroke="gray" stroke-width="2" d="M519,-8C519,-8 709,-8 709,-8 715,-8 721,-14 721,-20 721,-20 721,-310.4 721,-310.4 721,-316.4 715,-322.4 709,-322.4 709,-322.4 519,-322.4 519,-322.4 513,-322.4 507,-316.4 507,-310.4 507,-310.4 507,-20 507,-20 507,-14 513,-8 519,-8"/>
+<text xml:space="preserve" text-anchor="middle" x="614" y="-305.1" font-family="Times,serif" font-size="14.00">ReporterPlugin</text>
 </g>
 <g id="clust3" class="cluster">
 <title>cluster_HardwarePlugin</title>
-<path fill="lightyellow" stroke="gray" stroke-width="2" d="M570,-8C570,-8 878,-8 878,-8 884,-8 890,-14 890,-20 890,-20 890,-540.5 890,-540.5 890,-546.5 884,-552.5 878,-552.5 878,-552.5 570,-552.5 570,-552.5 564,-552.5 558,-546.5 558,-540.5 558,-540.5 558,-20 558,-20 558,-14 564,-8 570,-8"/>
-<text xml:space="preserve" text-anchor="middle" x="724" y="-535.2" font-family="Times,serif" font-size="14.00">HardwarePlugin</text>
-</g>
-<!-- NumberService -->
-<g id="node1" class="node">
-<title>NumberService</title>
-<polygon fill="white" stroke="black" points="139.9,-519.25 18.1,-519.25 18.1,-476.2 139.9,-476.2 139.9,-519.25"/>
-<text xml:space="preserve" text-anchor="middle" x="79" y="-493.45" font-family="Helvetica,sans-Serif" font-size="12.00">NumberService</text>
+<path fill="lightyellow" stroke="gray" stroke-width="2" d="M20,-123.05C20,-123.05 487,-123.05 487,-123.05 493,-123.05 499,-129.05 499,-135.05 499,-135.05 499,-425.45 499,-425.45 499,-431.45 493,-437.45 487,-437.45 487,-437.45 20,-437.45 20,-437.45 14,-437.45 8,-431.45 8,-425.45 8,-425.45 8,-135.05 8,-135.05 8,-129.05 14,-123.05 20,-123.05"/>
+<text xml:space="preserve" text-anchor="middle" x="253.5" y="-420.15" font-family="Times,serif" font-size="14.00">HardwarePlugin</text>
 </g>
-<!-- StringService -->
-<g id="node2" class="node">
-<title>StringService</title>
-<polygon fill="white" stroke="black" points="133.15,-404.2 24.85,-404.2 24.85,-361.15 133.15,-361.15 133.15,-404.2"/>
-<text xml:space="preserve" text-anchor="middle" x="79" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">StringService</text>
+<g id="clust4" class="cluster">
+<title>cluster_BasePlugin</title>
+<path fill="lightyellow" stroke="gray" stroke-width="2" d="M567,-353.15C567,-353.15 1059,-353.15 1059,-353.15 1065,-353.15 1071,-359.15 1071,-365.15 1071,-365.15 1071,-425.45 1071,-425.45 1071,-431.45 1065,-437.45 1059,-437.45 1059,-437.45 567,-437.45 567,-437.45 561,-437.45 555,-431.45 555,-425.45 555,-425.45 555,-365.15 555,-365.15 555,-359.15 561,-353.15 567,-353.15"/>
+<text xml:space="preserve" text-anchor="middle" x="813" y="-420.15" font-family="Times,serif" font-size="14.00">BasePlugin</text>
 </g>
-<!-- NumberService&#45;&gt;StringService -->
-<!-- DeferredService -->
-<g id="node3" class="node">
-<title>DeferredService</title>
-<polygon fill="white" stroke="black" points="141.77,-289.15 16.23,-289.15 16.23,-246.1 141.77,-246.1 141.77,-289.15"/>
-<text xml:space="preserve" text-anchor="middle" x="79" y="-263.35" font-family="Helvetica,sans-Serif" font-size="12.00">DeferredService</text>
+<!-- ReporterA -->
+<g id="node1" class="node">
+<title>ReporterA</title>
+<polygon fill="white" stroke="black" points="621.77,-289.15 532.23,-289.15 532.23,-246.1 621.77,-246.1 621.77,-289.15"/>
+<text xml:space="preserve" text-anchor="middle" x="577" y="-263.35" font-family="Helvetica,sans-Serif" font-size="12.00">ReporterA</text>
 </g>
-<!-- StringService&#45;&gt;DeferredService -->
 <!-- ReporterFactory -->
-<g id="node4" class="node">
+<g id="node2" class="node">
 <title>ReporterFactory</title>
-<polygon fill="white" stroke="black" points="398.4,-404.2 273.6,-404.2 273.6,-361.15 398.4,-361.15 398.4,-404.2"/>
-<text xml:space="preserve" text-anchor="middle" x="336" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">ReporterFactory</text>
+<polygon fill="white" stroke="black" points="639.4,-174.1 514.6,-174.1 514.6,-131.05 639.4,-131.05 639.4,-174.1"/>
+<text xml:space="preserve" text-anchor="middle" x="577" y="-148.3" font-family="Helvetica,sans-Serif" font-size="12.00">ReporterFactory</text>
+</g>
+<!-- ReporterA&#45;&gt;ReporterFactory -->
+<g id="edge4" class="edge">
+<title>ReporterA&#45;&gt;ReporterFactory</title>
+<path fill="none" stroke="black" d="M577,-245.63C577,-228.81 577,-204.94 577,-185.72"/>
+<polygon fill="black" stroke="black" points="580.5,-185.97 577,-175.97 573.5,-185.98 580.5,-185.97"/>
 </g>
 <!-- ReportFacade -->
-<g id="node6" class="node">
+<g id="node3" class="node">
 <title>ReportFacade</title>
-<polygon fill="white" stroke="black" points="398.27,-289.15 287.73,-289.15 287.73,-246.1 398.27,-246.1 398.27,-289.15"/>
-<text xml:space="preserve" text-anchor="middle" x="343" y="-263.35" font-family="Helvetica,sans-Serif" font-size="12.00">ReportFacade</text>
+<polygon fill="white" stroke="black" points="632.27,-59.05 521.73,-59.05 521.73,-16 632.27,-16 632.27,-59.05"/>
+<text xml:space="preserve" text-anchor="middle" x="577" y="-33.25" font-family="Helvetica,sans-Serif" font-size="12.00">ReportFacade</text>
 </g>
+<!-- ReporterA&#45;&gt;ReportFacade -->
 <!-- ReporterFactory&#45;&gt;ReportFacade -->
-<!-- ReporterFactory&#45;&gt;ReportFacade -->
-<g id="edge9" class="edge">
+<g id="edge3" class="edge">
 <title>ReporterFactory&#45;&gt;ReportFacade</title>
-<path fill="none" stroke="black" d="M358.85,-360.68C365.95,-343.78 368.45,-319.77 365.6,-300.5"/>
-<polygon fill="black" stroke="black" points="369.08,-300.02 363.54,-290.99 362.24,-301.51 369.08,-300.02"/>
-</g>
-<!-- ReporterA -->
-<g id="node5" class="node">
-<title>ReporterA</title>
-<polygon fill="white" stroke="black" points="387.77,-174.1 298.23,-174.1 298.23,-131.05 387.77,-131.05 387.77,-174.1"/>
-<text xml:space="preserve" text-anchor="middle" x="343" y="-148.3" font-family="Helvetica,sans-Serif" font-size="12.00">ReporterA</text>
-</g>
-<!-- ReporterA&#45;&gt;ReporterFactory -->
-<g id="edge10" class="edge">
-<title>ReporterA&#45;&gt;ReporterFactory</title>
-<path fill="none" stroke="black" d="M309.03,-174.49C288.3,-189.37 263.63,-211.42 252,-238.1 242.93,-258.9 243.83,-267.98 252,-289.15 261.76,-314.42 281.99,-337.06 300.14,-353.61"/>
-<polygon fill="black" stroke="black" points="297.34,-355.8 307.16,-359.78 301.96,-350.55 297.34,-355.8"/>
+<path fill="none" stroke="black" d="M577,-130.58C577,-113.76 577,-89.89 577,-70.67"/>
+<polygon fill="black" stroke="black" points="580.5,-70.92 577,-60.92 573.5,-70.93 580.5,-70.92"/>
 </g>
-<!-- ReportFacade&#45;&gt;ReporterA -->
-<!-- HardwareAbstraction -->
-<g id="node7" class="node">
-<title>HardwareAbstraction</title>
-<polygon fill="white" stroke="black" points="740.4,-519.25 585.6,-519.25 585.6,-476.2 740.4,-476.2 740.4,-519.25"/>
-<text xml:space="preserve" text-anchor="middle" x="663" y="-493.45" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareAbstraction</text>
-</g>
-<!-- HardwareAbstraction&#45;&gt;ReportFacade -->
-<g id="edge11" class="edge">
-<title>HardwareAbstraction&#45;&gt;ReportFacade</title>
-<path fill="none" stroke="black" d="M633.75,-475.88C575.67,-434.47 445.8,-341.9 381.12,-295.79"/>
-<polygon fill="black" stroke="black" points="383.47,-293.17 373.29,-290.22 379.41,-298.87 383.47,-293.17"/>
-</g>
-<!-- HardwareA -->
-<g id="node8" class="node">
-<title>HardwareA</title>
-<polygon fill="white" stroke="black" points="710.4,-404.2 615.6,-404.2 615.6,-361.15 710.4,-361.15 710.4,-404.2"/>
-<text xml:space="preserve" text-anchor="middle" x="663" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareA</text>
-</g>
-<!-- HardwareAbstraction&#45;&gt;HardwareA -->
 <!-- HardwareObserver -->
-<g id="node9" class="node">
+<g id="node4" class="node">
 <title>HardwareObserver</title>
-<polygon fill="white" stroke="black" points="734.02,-289.15 591.98,-289.15 591.98,-246.1 734.02,-246.1 734.02,-289.15"/>
-<text xml:space="preserve" text-anchor="middle" x="663" y="-263.35" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareObserver</text>
-</g>
-<!-- HardwareA&#45;&gt;HardwareObserver -->
-<!-- HardwareFactory -->
-<g id="node11" class="node">
-<title>HardwareFactory</title>
-<polygon fill="white" stroke="black" points="752.02,-59.05 621.98,-59.05 621.98,-16 752.02,-16 752.02,-59.05"/>
-<text xml:space="preserve" text-anchor="middle" x="687" y="-33.25" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareFactory</text>
-</g>
-<!-- HardwareA&#45;&gt;HardwareFactory -->
-<g id="edge12" class="edge">
-<title>HardwareA&#45;&gt;HardwareFactory</title>
-<path fill="none" stroke="black" d="M700.72,-360.81C725.48,-344.8 755.8,-320.19 770,-289.15 800.7,-222.01 797.94,-191.38 770,-123.05 760.92,-100.84 742.88,-81.32 725.93,-66.65"/>
-<polygon fill="black" stroke="black" points="728.32,-64.08 718.38,-60.4 723.85,-69.47 728.32,-64.08"/>
+<polygon fill="white" stroke="black" points="491.02,-404.2 348.98,-404.2 348.98,-361.15 491.02,-361.15 491.02,-404.2"/>
+<text xml:space="preserve" text-anchor="middle" x="420" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareObserver</text>
 </g>
 <!-- HardwareObserver&#45;&gt;ReporterA -->
-<g id="edge13" class="edge">
+<g id="edge7" class="edge">
 <title>HardwareObserver&#45;&gt;ReporterA</title>
-<path fill="none" stroke="black" d="M603.56,-245.63C544.98,-224.93 456.15,-193.55 398.85,-173.3"/>
-<polygon fill="black" stroke="black" points="400.2,-170.07 389.6,-170.04 397.87,-176.67 400.2,-170.07"/>
+<path fill="none" stroke="black" d="M457.88,-360.69C476.25,-349.98 498.32,-336.3 517,-322.4 527.31,-314.73 537.95,-305.64 547.35,-297.13"/>
+<polygon fill="black" stroke="black" points="549.49,-299.92 554.48,-290.57 544.75,-294.77 549.49,-299.92"/>
 </g>
-<!-- HardwareB -->
-<g id="node10" class="node">
-<title>HardwareB</title>
-<polygon fill="white" stroke="black" points="734.4,-174.1 639.6,-174.1 639.6,-131.05 734.4,-131.05 734.4,-174.1"/>
-<text xml:space="preserve" text-anchor="middle" x="687" y="-148.3" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareB</text>
+<!-- HardwareFactory -->
+<g id="node7" class="node">
+<title>HardwareFactory</title>
+<polygon fill="white" stroke="black" points="430.02,-289.15 299.98,-289.15 299.98,-246.1 430.02,-246.1 430.02,-289.15"/>
+<text xml:space="preserve" text-anchor="middle" x="365" y="-263.35" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareFactory</text>
 </g>
-<!-- HardwareObserver&#45;&gt;HardwareB -->
 <!-- HardwareObserver&#45;&gt;HardwareFactory -->
-<g id="edge14" class="edge">
+<!-- HardwareObserver&#45;&gt;HardwareFactory -->
+<g id="edge8" class="edge">
 <title>HardwareObserver&#45;&gt;HardwareFactory</title>
-<path fill="none" stroke="black" d="M643.66,-245.71C620.28,-217.77 586.15,-166.7 604,-123.05 613.08,-100.84 631.12,-81.32 648.07,-66.65"/>
-<polygon fill="black" stroke="black" points="650.15,-69.47 655.62,-60.4 645.68,-64.08 650.15,-69.47"/>
+<path fill="none" stroke="black" d="M431.34,-360.68C429.09,-343.15 417.68,-317.95 403.56,-298.35"/>
+<polygon fill="black" stroke="black" points="406.51,-296.44 397.6,-290.71 400.99,-300.74 406.51,-296.44"/>
+</g>
+<!-- HardwareB -->
+<g id="node5" class="node">
+<title>HardwareB</title>
+<polygon fill="white" stroke="black" points="110.4,-404.2 15.6,-404.2 15.6,-361.15 110.4,-361.15 110.4,-404.2"/>
+<text xml:space="preserve" text-anchor="middle" x="63" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareB</text>
 </g>
 <!-- HardwareB&#45;&gt;HardwareFactory -->
-<!-- HardwareB&#45;&gt;HardwareFactory -->
-<g id="edge15" class="edge">
+<g id="edge9" class="edge">
 <title>HardwareB&#45;&gt;HardwareFactory</title>
-<path fill="none" stroke="black" d="M708.55,-130.58C714.61,-113.68 715.61,-89.67 711.57,-70.4"/>
-<polygon fill="black" stroke="black" points="714.97,-69.56 708.92,-60.87 708.23,-71.44 714.97,-69.56"/>
+<path fill="none" stroke="black" d="M110.85,-363.76C161.4,-344.84 241.48,-314.86 298.23,-293.62"/>
+<polygon fill="black" stroke="black" points="299.34,-296.94 307.48,-290.16 296.89,-290.38 299.34,-296.94"/>
+</g>
+<!-- HardwareA -->
+<g id="node6" class="node">
+<title>HardwareA</title>
+<polygon fill="white" stroke="black" points="277.4,-404.2 182.6,-404.2 182.6,-361.15 277.4,-361.15 277.4,-404.2"/>
+<text xml:space="preserve" text-anchor="middle" x="230" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareA</text>
+</g>
+<!-- HardwareA&#45;&gt;HardwareFactory -->
+<g id="edge10" class="edge">
+<title>HardwareA&#45;&gt;HardwareFactory</title>
+<path fill="none" stroke="black" d="M255.08,-360.68C276.58,-342.67 307.74,-316.58 331.39,-296.77"/>
+<polygon fill="black" stroke="black" points="333.48,-299.59 338.9,-290.48 328.98,-294.22 333.48,-299.59"/>
+</g>
+<!-- HardwareAbstraction -->
+<g id="node8" class="node">
+<title>HardwareAbstraction</title>
+<polygon fill="white" stroke="black" points="442.4,-174.1 287.6,-174.1 287.6,-131.05 442.4,-131.05 442.4,-174.1"/>
+<text xml:space="preserve" text-anchor="middle" x="365" y="-148.3" font-family="Helvetica,sans-Serif" font-size="12.00">HardwareAbstraction</text>
 </g>
 <!-- HardwareFactory&#45;&gt;HardwareAbstraction -->
-<g id="edge16" class="edge">
+<g id="edge5" class="edge">
 <title>HardwareFactory&#45;&gt;HardwareAbstraction</title>
-<path fill="none" stroke="black" d="M731.32,-59.46C755.83,-73.64 784.07,-94.94 798,-123.05 830.77,-189.2 810.39,-216.37 798,-289.15 786.28,-358 787.93,-381.59 746,-437.45 736.77,-449.75 724.24,-460.53 711.73,-469.4"/>
-<polygon fill="black" stroke="black" points="709.81,-466.47 703.47,-474.96 713.72,-472.28 709.81,-466.47"/>
+<path fill="none" stroke="black" d="M365,-245.63C365,-228.81 365,-204.94 365,-185.72"/>
+<polygon fill="black" stroke="black" points="368.5,-185.97 365,-175.97 361.5,-185.98 368.5,-185.97"/>
+</g>
+<!-- HardwareAbstraction&#45;&gt;ReportFacade -->
+<g id="edge6" class="edge">
+<title>HardwareAbstraction&#45;&gt;ReportFacade</title>
+<path fill="none" stroke="black" d="M404.38,-130.58C439.33,-111.94 490.54,-84.63 528.11,-64.6"/>
+<polygon fill="black" stroke="black" points="529.32,-67.92 536.5,-60.12 526.03,-61.74 529.32,-67.92"/>
+</g>
+<!-- NumberService -->
+<g id="node9" class="node">
+<title>NumberService</title>
+<polygon fill="white" stroke="black" points="684.9,-404.2 563.1,-404.2 563.1,-361.15 684.9,-361.15 684.9,-404.2"/>
+<text xml:space="preserve" text-anchor="middle" x="624" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">NumberService</text>
+</g>
+<!-- DeferredService -->
+<g id="node10" class="node">
+<title>DeferredService</title>
+<polygon fill="white" stroke="black" points="882.77,-404.2 757.23,-404.2 757.23,-361.15 882.77,-361.15 882.77,-404.2"/>
+<text xml:space="preserve" text-anchor="middle" x="820" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">DeferredService</text>
+</g>
+<!-- StringService -->
+<g id="node11" class="node">
+<title>StringService</title>
+<polygon fill="white" stroke="black" points="1063.15,-404.2 954.85,-404.2 954.85,-361.15 1063.15,-361.15 1063.15,-404.2"/>
+<text xml:space="preserve" text-anchor="middle" x="1009" y="-378.4" font-family="Helvetica,sans-Serif" font-size="12.00">StringService</text>
 </g>
 </g>
 </svg>
diff --git a/stubs/dependency/library/graph/generate.pyi b/stubs/dependency/library/graph/generate.pyi
index 5d6fa13..b587b16 100644
--- a/stubs/dependency/library/graph/generate.pyi
+++ b/stubs/dependency/library/graph/generate.pyi
@@ -1,6 +1,6 @@
 from dependency.core import Registry as Registry
-from dependency.library.graph.models import Graph as Graph
-from dependency.library.graph.process import process_container as process_container
+from dependency.core.injection import ContainerInjection as ContainerInjection, ProviderInjection as ProviderInjection
+from dependency.library.graph.models import Cluster as Cluster, Edge as Edge, Graph as Graph, Node as Node
 
 def generate_graph(output: str = 'build/output', ignore_modules: set[str] = {'BasePlugin'}) -> None:
     """Generate a graph visualization of the registered containers and providers.
@@ -10,3 +10,5 @@ def generate_graph(output: str = 'build/output', ignore_modules: set[str] = {'Ba
     the graphviz library to create a visual representation of the nodes and
     their relationships.
     """
+def process_container(graph: Graph, container: ContainerInjection, ignore_modules: set[str] = {'BasePlugin'}) -> Cluster: ...
+def process_provider(graph: Graph, provider: ProviderInjection, ignore_modules: set[str] = {'BasePlugin'}) -> Node: ...
diff --git a/stubs/dependency/library/graph/models.pyi b/stubs/dependency/library/graph/models.pyi
index 2f6f7c2..3483369 100644
--- a/stubs/dependency/library/graph/models.pyi
+++ b/stubs/dependency/library/graph/models.pyi
@@ -3,24 +3,23 @@ from abc import ABC, abstractmethod
 from graphviz import Digraph
 from pydantic import BaseModel
 
+GROUP_SIZE: int
+
 class Graph(BaseModel):
     name: str
-    drawable: dict[str, Drawable]
+    drawable: list[Drawable]
     edges: list[Edge]
     def draw(self) -> Digraph: ...
 
 class Drawable(BaseModel, ABC, metaclass=abc.ABCMeta):
     name: str
-    label: str | None
     in_degree: int
     @abstractmethod
     def draw(self, parent: Digraph) -> None: ...
 
 class Cluster(Drawable):
     childs: list[Drawable]
-    include_modules: bool
     style: dict[str, str]
-    def get_childs(self) -> list[Drawable]: ...
     def draw(self, parent: Digraph) -> None: ...
 
 class Node(Drawable):
@@ -30,5 +29,4 @@ class Node(Drawable):
 class Edge(BaseModel):
     source: str
     target: str
-    same_cluster: bool
     def draw(self, parent: Digraph) -> None: ...
diff --git a/stubs/dependency/library/graph/process.pyi b/stubs/dependency/library/graph/process.pyi
deleted file mode 100644
index 670f006..0000000
--- a/stubs/dependency/library/graph/process.pyi
+++ /dev/null
@@ -1,5 +0,0 @@
-from dependency.core.injection import ContainerInjection as ContainerInjection, ProviderInjection as ProviderInjection
-from dependency.library.graph.models import Cluster as Cluster, Drawable as Drawable, Edge as Edge, Graph as Graph, Node as Node
-
-def process_container(graph: Graph, container: ContainerInjection, ignore_modules: set[str] = {'BasePlugin'}) -> Cluster: ...
-def process_provider(graph: Graph, provider: ProviderInjection, ignore_modules: set[str] = {'BasePlugin'}) -> Node: ...