diff --git a/.clang-uml b/.clang-uml
index 74c9b6e1..192bfc80 100644
--- a/.clang-uml
+++ b/.clang-uml
@@ -16,6 +16,7 @@ diagrams:
         - 'title clang-uml namespaces'
   config_class:
     type: class
+    include_relations_also_as_members: false
     glob:
       - src/config/config.h
       - src/config/config.cc
@@ -29,6 +30,7 @@ diagrams:
         - 'title clang-uml configuration model'
   decorators_class:
     type: class
+    include_relations_also_as_members: false
     glob:
       - src/decorators/decorators.h
       - src/decorators/decorators.cc
@@ -39,4 +41,83 @@ diagrams:
       - clanguml::decorators
     plantuml:
       before:
-        - 'title clang-uml decorators model'
\ No newline at end of file
+        - 'title clang-uml decorators model'
+  common_model_class:
+    type: class
+    include_relations_also_as_members: false
+    glob:
+      - src/common/model/*.h
+      - src/common/model/*.cc
+    include:
+      namespaces:
+        - clanguml::common::model
+    using_namespace:
+      - clanguml::common::model
+    plantuml:
+      before:
+        - 'title clang-uml common diagram model'
+  class_model_class:
+    type: class
+    include_relations_also_as_members: false
+    glob:
+      - src/class_diagram/model/*.h
+      - src/class_diagram/model/*.cc
+    include:
+      namespaces:
+        - clanguml::class_diagram::model
+    using_namespace:
+      - clanguml::class_diagram::model
+    plantuml:
+      before:
+        - 'title clang-uml class diagram model'
+  sequence_model_class:
+    type: class
+    include_relations_also_as_members: false
+    glob:
+      - src/sequence_diagram/model/*.h
+      - src/sequence_diagram/model/*.cc
+    include:
+      namespaces:
+        - clanguml::sequence_diagram::model
+    using_namespace:
+      - clanguml::sequence_diagram::model
+    plantuml:
+      before:
+        - 'title clang-uml sequence diagram model'
+  package_model_class:
+    type: class
+    include_relations_also_as_members: false
+    glob:
+      - src/package_diagram/model/*.h
+      - src/package_diagram/model/*.cc
+    include:
+      namespaces:
+        - clanguml::package_diagram::model
+    using_namespace:
+      - clanguml::package_diagram::model
+    plantuml:
+      before:
+        - 'title clang-uml package diagram model'
+  diagram_model_class:
+    type: class
+    include_relations_also_as_members: false
+    glob:
+      - src/common/model/*.h
+      - src/common/model/*.cc
+      - src/class_diagram/model/*.h
+      - src/class_diagram/model/*.cc
+      - src/sequence_diagram/model/*.h
+      - src/sequence_diagram/model/*.cc
+      - src/package_diagram/model/*.h
+      - src/package_diagram/model/*.cc
+    include:
+      namespaces:
+        - clanguml::common::model
+        - clanguml::class_diagram::model
+        - clanguml::sequence_diagram::model
+        - clanguml::package_diagram::model
+    using_namespace:
+      - clanguml
+    plantuml:
+      before:
+        - 'title clang-uml diagram model'
\ No newline at end of file